From a675df7cc59547617065f6f1e1f0f9c90eff842f Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Thu, 5 Apr 2018 16:39:42 +0200 Subject: [PATCH] Use composer.stg for staging hosts Signed-off-by: Clement Verna --- inventory/group_vars/osbs-masters | 2 ++ inventory/group_vars/osbs-masters-stg | 1 + playbooks/groups/osbs-cluster.yml | 12 ++++++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/inventory/group_vars/osbs-masters b/inventory/group_vars/osbs-masters index 41acc4f101..ea6cc65368 100644 --- a/inventory/group_vars/osbs-masters +++ b/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 diff --git a/inventory/group_vars/osbs-masters-stg b/inventory/group_vars/osbs-masters-stg index 2ed3811191..7f17ef3499 100644 --- a/inventory/group_vars/osbs-masters-stg +++ b/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 diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index ec4f05a6f4..19180bd823 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/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