Merge branch 'master' of /git/ansible

inventory/group_vars/osbs-masters

@@ -23,6 +23,8 @@ osbs_client_conf_path: /etc/osbs.conf
 openshift_node_labels: {'region':'infra'}
 openshift_schedulable: False
 
+composer: compose-x86-01.phx2.fedoraproject.org
+
 nagios_Check_Services:
   nrpe: true
   sshd: true

inventory/group_vars/osbs-masters-stg

@@ -51,6 +51,7 @@ osbs_worker_clusters:
     openshift_url: https://osbs.fedoraproject.org/
     verify_ssl: 'false'
 
+composer: composer.stg.phx2.fedoraproject.org
 
 nagios_Check_Services:
   nrpe: true

playbooks/groups/osbs-cluster.yml

@@ -550,20 +550,20 @@
     - name: pull fedora required docker images
       shell: "docker pull {{item}}"
       with_items: "{{fedora_required_images}}"
-      delegate_to: compose-x86-01.phx2.fedoraproject.org
+      delegate_to: "{{ composer }}"
       register: docker_pull_fedora_delegated
       changed_when: "'Downloaded newer image' in docker_pull_fedora_delegated.stdout"
 
     - name: tag fedora required docker images for our registry
       shell: "docker tag {{item}} {{docker_registry}}/{{item}}"
       with_items: "{{fedora_required_images}}"
-      delegate_to: compose-x86-01.phx2.fedoraproject.org
+      delegate_to: "{{ composer }}"
       when: docker_pull_fedora_delegated|changed
 
     - name: push fedora required docker images to our registry
       shell: "docker push {{docker_registry}}/{{item}}"
       with_items: "{{fedora_required_images}}"
-      delegate_to: compose-x86-01.phx2.fedoraproject.org
+      delegate_to: "{{ composer }}"
       when: docker_pull_fedora_delegated|changed
 
     - name: register origin_version_out rpm query
@@ -578,20 +578,20 @@
     - name: pull openshift required docker images
       shell: "docker pull {{item}}:v{{origin_version}}"
       with_items: "{{openshift_required_images}}"
-      delegate_to: compose-x86-01.phx2.fedoraproject.org
+      delegate_to: "{{ composer }}"
       register: docker_pull_openshift_delegated
       changed_when: "'Downloaded newer image' in docker_pull_openshift_delegated.stdout"
 
     - name: tag openshift required docker images for our registry
       shell: "docker tag {{item}}:v{{origin_version}} {{docker_registry}}/{{item}}:v{{origin_version}}"
       with_items: "{{openshift_required_images}}"
-      delegate_to: compose-x86-01.phx2.fedoraproject.org
+      delegate_to: "{{ composer }}"
       when: docker_pull_openshift_delegated|changed
 
     - name: push openshift required docker images to our registry
       shell: "docker push {{docker_registry}}/{{item}}:v{{origin_version}}"
       with_items: "{{openshift_required_images}}"
-      delegate_to: compose-x86-01.phx2.fedoraproject.org
+      delegate_to: "{{ composer }}"
       when: docker_pull_openshift_delegated|changed
 
     - name: create fedora image stream for OpenShift