pre-stage openshift docker images in our registry for osbs

Signed-off-by: Adam Miller <admiller@redhat.com>

inventory/group_vars/all

@@ -160,3 +160,8 @@ csi_relationship: |
     * What hosts/services rely on this?
 
     To update this text, add the csi_* vars to group_vars/ in ansible.
+
+
+# docker images required by OpenShift Origin
+openshift_required_images:
+  - "openshift/origin-pod"

playbooks/groups/osbs-master.yml

@@ -191,6 +191,32 @@
       when: env == "production"
       }
 
+  tasks:
+
+    - name: register origin_version
+      shell: "rpm -q origin --qf '%{Version}'"
+      register: origin_version
+
+- name: pre-stage content in our docker registry
+  hosts: compose-x86-01.phx2.fedoraproject.org
+  user: root
+  gather_facts: True
+  tags:
+    - releng-compose
+
+  tasks:
+    - name: pull openshift required docker images
+      shell: "docker pull {{item}}:v{{origin_version.stdout}}"
+      with_items: {{openshift_required_images}}
+
+    - name: tag openshift required docker images for our registry
+      shell: "docker tag {{item}}:v{{origin_version.stdout}} {{docker_registry}}/{{item}}:v{{origin_version.stdout}}"
+      with_items: {{openshift_required_images}}
+
+    - name: push openshift required docker images to our registry
+      shell: "docker push {{docker_registry}}/{{item}}:v{{origin_version.stdout}}"
+      with_items: {{openshift_required_images}}
+
 - name: post-install osbs tasks
   hosts: osbs:osbs-stg
   vars_files:
@@ -281,10 +307,13 @@
         dest: /etc/osbs/buildroot/atomic-reactor.tar.gz
         state: hard
 
-    - name: pull openshift required docker images and tag locally
+    - name: pull openshift required docker images
-      shell: "docker pull {{docker_registry}}/{{item}}:v$(rpm -q origin --qf '%{Version}') && docker tag {{docker_registry}}/{{item}}:v$(rpm -q origin --qf '%{Version}') {{item}}:v$(rpm -q origin --qf '%{Version}')"
+      shell: "docker pull {{docker_registry}}/{{item}}:v{{origin_version.stdout}}"
-      with_items:
+      with_items: {{openshift_required_images}}
-        - "openshift/origin-pod"
+
+    - name: tag openshift required docker images locally
+      shell: "docker tag {{docker_registry}}/{{item}}:v{{origin_version.stdout}} {{item}}:v{{origin_version.stdout}}"
+      with_items: {{openshift_required_images}}
 
     - name: refresh fedora image streams
       shell: "oc import-image fedora --all"