Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fix duplicate var definitions and typo in osbs koji set policy

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2017-07-17 18:44:03 +00:00
parent d83aebaf80
commit 9af17608bb
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/osbs-stg
View file

@ -90,8 +90,6 @@ osbs_authoritative_registry: "{{ stable_registry }}"
osbs_registry_api_versions: osbs_registry_api_versions:
- v2 - v2
osbs_registry_secret_name: v2-registry-dockercfg osbs_registry_secret_name: v2-registry-dockercfg
osbs_registry_uri: ''
osbs_source_registry_uri: ''
osbs_build_json_dir: /usr/share/osbs osbs_build_json_dir: /usr/share/osbs
osbs_sources_command: fedpkg sources osbs_sources_command: fedpkg sources
osbs_vendor: Fedora Project osbs_vendor: Fedora Project

7
playbooks/groups/osbs-orchestrator-cluster.yml
View file

@ -385,11 +385,6 @@
- name: Setup Koji auth for OpenShift Orchestrator - name: Setup Koji auth for OpenShift Orchestrator
hosts: osbs-masters-stg[0] hosts: osbs-masters-stg[0]
tags:
- osbs-cluster-req
user: root
gather_facts: True
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml
- "/srv/private/ansible/vars.yml" - "/srv/private/ansible/vars.yml"
@ -413,7 +408,7 @@
when: env == "staging" when: env == "staging"
- name: set policy for koji builder in openshift for atomic-reactor - name: set policy for koji builder in openshift for atomic-reactor
shell: "oadm policy add-role-to-user -n {{ osbs_namespace }} edit system:serviceaccount:{{osbs_namespace}}:{{osbs_ && touch /etc/origin/atomic-reactor-policy-added" shell: "oadm policy add-role-to-user -n {{ osbs_namespace }} edit system:serviceaccount:{{osbs_namespace}}:{{osbs_builder_user}} && touch /etc/origin/atomic-reactor-policy-added"
args: args:
creates: "/etc/origin/atomic-reactor-policy-added" creates: "/etc/origin/atomic-reactor-policy-added"