Merge pull request #560 from IBM/db2-instance-hotfix

#559 Db2 instance provisioning fails
IBM · Oct 17, 2023 · 3f50608 · 3f50608
2 parents 0a67360 + 7a58a22
commit 3f50608
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/automation-roles/60-configure-cloud-pak/cp4d/cp4d-cluster-configure/tasks/main.yml b/automation-roles/60-configure-cloud-pak/cp4d/cp4d-cluster-configure/tasks/main.yml
@@ -3,6 +3,12 @@
   debug:
     msg: "Handling configuration for CP4D cluster {{ current_cp4d_cluster.project }}"
 
+- name: Switch to the correct olm-utils version
+  include_role:
+    name: cp4d-switch-olm-utils
+  vars:
+    _p_current_cp4d_cluster: "{{ current_cp4d_cluster }}"
+
 - include_role:
     name: cp4d-variables
   vars:

diff --git a/...-roles/60-configure-cloud-pak/cp4d/cp4d-instance-db2oltp/tasks/provision_db2_instance.yml b/...-roles/60-configure-cloud-pak/cp4d/cp4d-instance-db2oltp/tasks/provision_db2_instance.yml
@@ -40,7 +40,7 @@
       return_content: yes
       validate_certs: no
       status_code: 200
-    register: _databases_details_result
+    register: _databases_details_result_v1
     when: current_cp4d_cluster.cp4d_version < '4.7.0'
 
   - name: Get CP4D Database specifications
@@ -53,7 +53,15 @@
       return_content: yes
       validate_certs: no
       status_code: 200
-    register: _databases_details_result
+    register: _databases_details_result_v2
+    when: current_cp4d_cluster.cp4d_version >= '4.7.0'
+
+  - set_fact:
+      _databases_details_result: "{{ _databases_details_result_v1 }}"
+    when: current_cp4d_cluster.cp4d_version < '4.7.0'
+
+  - set_fact:
+      _databases_details_result: "{{ _databases_details_result_v2 }}"
     when: current_cp4d_cluster.cp4d_version >= '4.7.0'
 
   - debug: