From 56536e1a2d48fa1864727dcbaae59669bbd6a059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Thu, 7 Dec 2017 17:40:35 +0100
Subject: [PATCH] only import relevant tags

---
 ...provision-global-templates-and-imagestreams.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/playbooks/provision-global-templates-and-imagestreams.yml b/playbooks/provision-global-templates-and-imagestreams.yml
index cee2db1..57c4792 100644
--- a/playbooks/provision-global-templates-and-imagestreams.yml
+++ b/playbooks/provision-global-templates-and-imagestreams.yml
@@ -83,13 +83,19 @@
       command: oc import-image {{ item }} --confirm --scheduled --all -n openshift
       with_items: '{{ oc_get_is.stdout_lines }}'
 
-    - name: Import additional Red Hat image streams
-      command: oc import-image -n openshift {{ item.key }} --from {{ item.value }} --confirm --scheduled --all
+    - name: Import additional Red Hat image streams (initial import)
+      command: oc import-image -n openshift {{ item.key }} --from {{ item.value }} --confirm --scheduled
       with_dict:
-        rhel-atomic: rhel-atomic
-        rhel: rhel7.4
+        rhel7-atomic: registry.access.redhat.com/rhel7-atomic:latest
+        rhel7: registry.access.redhat.com/rhel7:latest
       when: '(''imagestreams/'' ~ item.key) not in oc_get_is.stdout_lines'
 
+    - name: Import additional Red Hat image streams (additional tags)
+      command: oc tag -n openshift {{ item.value }} {{ item.key }} --scheduled
+      with_dict:
+        'rhel7-atomic:7.4': registry.access.redhat.com/rhel7-atomic:7.4
+        'rhel7:7.4': registry.access.redhat.com/rhel7:7.4
+
     - name: Delete the temporary directory
       file:
         path: '{{ tempfile.path }}'