Merge pull request #889 from IBM/apply-olm-hotfix

#888 Fix issue with _apply_olm_cartridges_list fact - HOTFIX
IBM · Jan 28, 2025 · 7a80692 · 7a80692
2 parents 76391e8 + 88c8575
commit 7a80692
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/tasks/main.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/tasks/main.yml
@@ -6,28 +6,6 @@
 - set_fact:
     _cp4d_cartridges_installed_successfully: True
 
-- set_fact:
-    _apply_olm_cartridges_list: >-
-      {{ _cartridges_to_install
-        | map(attribute='olm_utils_name')
-        | difference(_v_cp4d_control_plane_cartridges)
-        | list
-        | join(',')}}
-
-- set_fact:
-    _apply_cr_cartridges: >-
-      {{  _cartridges_to_install | 
-            selectattr('separate_install','undefined') |
-            union(_cartridges_to_install | selectattr('separate_install','defined') | selectattr('separate_install','!=',True)) }}
-
-- set_fact:
-    _apply_cr_cartridges_list: >-
-      {{  _apply_cr_cartridges 
-        | map(attribute='olm_utils_name')
-        | difference(_v_cp4d_control_plane_cartridges)
-        | list
-        | join(',')}}
-
 - name: Create catalog sources for Cloud Pak for Data cartridges in project {{ _p_current_cp4d_cluster.project }}
   include_role:
     name: cp4d-catalog-source

diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/main.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/main.yml
@@ -137,6 +137,28 @@
             map(attribute='olm_utils_name') | 
             join(',')}}
 
+- set_fact:
+    _apply_olm_cartridges_list: >-
+      {{ _cartridges_to_install
+        | map(attribute='olm_utils_name')
+        | difference(_v_cp4d_control_plane_cartridges)
+        | list
+        | join(',')}}
+
+- set_fact:
+    _apply_cr_cartridges: >-
+      {{  _cartridges_to_install | 
+            selectattr('separate_install','undefined') |
+            union(_cartridges_to_install | selectattr('separate_install','defined') | selectattr('separate_install','!=',True)) }}
+
+- set_fact:
+    _apply_cr_cartridges_list: >-
+      {{  _apply_cr_cartridges 
+        | map(attribute='olm_utils_name')
+        | difference(_v_cp4d_control_plane_cartridges)
+        | list
+        | join(',')}}
+
 - set_fact:
     _upgrade_cp4d: False