Move update_containers related task under kustomize_and_deploy

Currently update_containers related task is failing with ''_ctlplane_name'' is undefined error. _ctlplane_name is set in kustomize_and_deploy.yml task file and way before that update_containers related task is called. that's why above error is coming. Moving the update_containers related task in kustomize_and_deploy.yml fixes the issue. Signed-off-by: Chandan Kumar <[email protected]>
openstack-k8s-operators · Jun 6, 2024 · 0f6a0c1 · 0f6a0c1
1 parent 2412d35
commit 0f6a0c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/roles/edpm_prepare/tasks/kustomize_and_deploy.yml b/roles/edpm_prepare/tasks/kustomize_and_deploy.yml
@@ -74,6 +74,15 @@
         ).metadata.name
       }}
 
+- name: Update BM CSV or Ansibleee CSV to update proper image
+  when: >-
+      (cifmw_update_containers_edpm_image_url is defined) or
+      (cifmw_update_containers_ansibleee_image_url is defined)
+  vars:
+    cifmw_update_containers_metadata: "{{ _ctlplane_name }}"
+  ansible.builtin.include_role:
+    name: update_containers
+
 - name: Wait for OpenStack controlplane to be deployed
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"

diff --git a/roles/edpm_prepare/tasks/main.yml b/roles/edpm_prepare/tasks/main.yml
@@ -144,15 +144,6 @@
   tags:
     - control-plane
 
-- name: Update BM CSV or Ansibleee CSV to update proper image
-  when: >-
-      (cifmw_update_containers_edpm_image_url is defined) or
-      (cifmw_update_containers_ansibleee_image_url is defined)
-  vars:
-    cifmw_update_containers_metadata: "{{ _ctlplane_name }}"
-  ansible.builtin.include_role:
-    name: update_containers
-
 - name: Deploy NetConfig
   vars:
     make_netconfig_deploy_env: "{{ cifmw_edpm_prepare_common_env }}"