summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Miller <admiller@redhat.com>2017-08-07 22:00:59 +0000
committerAdam Miller <admiller@redhat.com>2017-08-07 22:01:02 +0000
commitc0d67799b55ee09c48c9e1d16e7c0a701d6ee076 (patch)
treef72c26c0b0fee2d3ae2575f3f4a95d30222db1b0
parent35cedf85479b7cfe1a5e2d715da7f023bed62247 (diff)
downloadansible-c0d67799b55ee09c48c9e1d16e7c0a701d6ee076.tar.gz
ansible-c0d67799b55ee09c48c9e1d16e7c0a701d6ee076.tar.xz
ansible-c0d67799b55ee09c48c9e1d16e7c0a701d6ee076.zip
update fedora image stream for osbs orchestrator cluster
Signed-off-by: Adam Miller <admiller@redhat.com>
-rw-r--r--inventory/group_vars/osbs-stg4
-rw-r--r--playbooks/groups/osbs-orchestrator-cluster.yml6
2 files changed, 10 insertions, 0 deletions
diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg
index 214072b8c..e7f8e015b 100644
--- a/inventory/group_vars/osbs-stg
+++ b/inventory/group_vars/osbs-stg
@@ -124,6 +124,10 @@ osbs_nodes: "{{ groups['osbs-orchestrator-' + env + '-nodes'] }}"
osbs_orchestrator_default_nodeselector: "orchestrator=true"
osbs_worker_default_nodeselector: "worker=true"
+# fedora container images required by buildroot
+fedora_required_images:
+ - "fedora:latest"
+
# docker images required by OpenShift Origin
openshift_required_images:
- "openshift/origin-pod"
diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml
index 590c85925..f10c98129 100644
--- a/playbooks/groups/osbs-orchestrator-cluster.yml
+++ b/playbooks/groups/osbs-orchestrator-cluster.yml
@@ -783,6 +783,12 @@
register: docker_pull_openshift
changed_when: "'Downloaded newer image' in docker_pull_openshift.stdout"
+ - name: pull fedora required docker images
+ shell: "docker pull {{stable_registry}}/{{item}}"
+ with_items: "{{fedora_required_images}}"
+ register: docker_pull_fedora
+ changed_when: "'Downloaded newer image' in docker_pull_fedora.stdout"
+
- name: tag openshift required docker images locally
shell: "docker tag {{candidate_registry}}/{{item}}:{{origin_release}} {{item}}:{{origin_release}}"
with_items: "{{openshift_required_images}}"