From c5f8fe7189e427313d47c6312b48e84aef74deea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Thu, 28 Nov 2024 18:16:55 +0100 Subject: [PATCH] Prefix openshift/import-image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- playbooks/manual/upgrade/koschei-full.yml | 3 ++- playbooks/manual/upgrade/koschei-rolling.yml | 3 ++- roles/openshift/import-image/tasks/main.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/playbooks/manual/upgrade/koschei-full.yml b/playbooks/manual/upgrade/koschei-full.yml index 22a019a29f..d7bb2ca963 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 ec77c0aea5..630d1c63c8 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 7a6557c57e..cc22916561 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}}