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

fix yet another recursive var definition in osbs-orchestrotor

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2017-07-17 19:28:15 +00:00
parent e98497d13b
commit 5201790a29
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/group_vars/osbs-stg
View file

@ -19,7 +19,6 @@ koji_builder_user: dockerbuilder
osbs_client_conf_path: /etc/osbs.conf osbs_client_conf_path: /etc/osbs.conf
openshift_htpasswd_file: /etc/origin/htpasswd
# openshift-ansible variables # openshift-ansible variables
oa_version: openshift-ansible-3.5.97-1 oa_version: openshift-ansible-3.5.97-1
@ -27,8 +26,9 @@ oa_ssh_user: root
oa_install_examples: false oa_install_examples: false
oa_containerized_deploy: false oa_containerized_deploy: false
oa_auth_profile: osbs oa_auth_profile: osbs
origin_release: v1.5.1
oa_debug_level: 2 oa_debug_level: 2
oa_htpasswd_file: /etc/origin/htpasswd
origin_release: v1.5.1
osbs_namespace: "osbs" osbs_namespace: "osbs"
osbs_koji_username: "kojibuilder_stg" osbs_koji_username: "kojibuilder_stg"

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

@ -98,7 +98,7 @@
- name: place htpasswd file - name: place htpasswd file
copy: copy:
src: "{{private}}/files/httpd/osbs-{{env}}.htpasswd" src: "{{private}}/files/httpd/osbs-{{env}}.htpasswd"
dest: "{{ openshift_htpasswd_file }}" dest: "{{ oa_htpasswd_file }}"
# This installs required pre-reqs and deploys the Controler's public key to all # This installs required pre-reqs and deploys the Controler's public key to all
@ -206,7 +206,7 @@
roles: roles:
- role: ansible-ansible-openshift-ansible - role: ansible-ansible-openshift-ansible
cluster_inventory_filename: "orchestrator-cluster-inventory-stg" cluster_inventory_filename: "orchestrator-cluster-inventory-stg"
openshift_htpasswd_file: "{{ openshift_htpasswd_file }}" openshift_htpasswd_file: "{{ oa_htpasswd_file }}"
openshift_master_public_api_url: "https://{{ osbs_url }}:8443" openshift_master_public_api_url: "https://{{ osbs_url }}:8443"
openshift_release: "{{ origin_release }}" openshift_release: "{{ origin_release }}"
openshift_ansible_path: "/root/openshift-ansible" openshift_ansible_path: "/root/openshift-ansible"
@ -230,7 +230,7 @@
- role: ansible-ansible-openshift-ansible - role: ansible-ansible-openshift-ansible
cluster_inventory_filename: "x86-64-worker-cluster-inventory-stg" cluster_inventory_filename: "x86-64-worker-cluster-inventory-stg"
openshift_htpasswd_file: "{{ openshift_htpasswd_file }}" openshift_htpasswd_file: "{{ oa_htpasswd_file }}"
openshift_master_public_api_url: "https://{{ osbsworker_x86_64_url }}:8443" openshift_master_public_api_url: "https://{{ osbsworker_x86_64_url }}:8443"
openshift_release: "{{ origin_release }}" openshift_release: "{{ origin_release }}"
openshift_ansible_path: "/root/openshift-ansible" openshift_ansible_path: "/root/openshift-ansible"