From c5f8fe7189e427313d47c6312b48e84aef74deea Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Dec 03 2024 09:48:46 +0000
Subject: Prefix openshift/import-image


Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

---

diff --git a/playbooks/manual/upgrade/koschei-full.yml b/playbooks/manual/upgrade/koschei-full.yml
index 22a019a..d7bb2ca 100644
--- a/playbooks/manual/upgrade/koschei-full.yml
+++ b/playbooks/manual/upgrade/koschei-full.yml
@@ -32,7 +32,8 @@
   - name: Import upstream image into OpenShift
     include_role: name=openshift/import-image
     vars:
-      imagestreamname: koschei
+      import_image_app: "{{ app }}"
+      import_image_imagestreamname: koschei
 
   - name: Run database migrations
     include_role: name=openshift-apps/koschei/job
diff --git a/playbooks/manual/upgrade/koschei-rolling.yml b/playbooks/manual/upgrade/koschei-rolling.yml
index ec77c0a..630d1c6 100644
--- a/playbooks/manual/upgrade/koschei-rolling.yml
+++ b/playbooks/manual/upgrade/koschei-rolling.yml
@@ -19,7 +19,8 @@
   - name: Import upstream image into OpenShift
     include_role: name=openshift/import-image
     vars:
-      imagestreamname: koschei
+      import_image_app: "{{ app }}"
+      import_image_imagestreamname: koschei
 
   - name: Restart all deployments
     shell: oc -n koschei rollout restart deploy
diff --git a/roles/openshift/import-image/tasks/main.yml b/roles/openshift/import-image/tasks/main.yml
index 7a6557c..cc22916 100644
--- a/roles/openshift/import-image/tasks/main.yml
+++ b/roles/openshift/import-image/tasks/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: Run `oc import-image`
-  shell: oc -n {{app}} import-image {{imagestreamname}}
+  shell: oc -n {{import_image_app}} import-image {{import_image_imagestreamname}}