Merge pull request #890 from IBM/cpd-511

Software Hub 5.1.1 support
IBM · Jan 29, 2025 · 57cd5c6 · 57cd5c6
2 parents 7a80692 + b5f842b
commit 57cd5c6
Show file tree

Hide file tree

Showing 6 changed files with 486 additions and 6 deletions.
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/get-cr-status.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/get-cr-status.yml
@@ -24,7 +24,7 @@
 - name: Create header line if CR status does not exist
   lineinfile:
     path: /tmp/work/status.csv
-    line: "Component,CR Kind,CR Name,Creation Timestamp,Namespace,Expected Version,Reconciled Version,Operator Information,Progress,Progress Message,Reconcile History,Status"
+    line: "Components,CR Kind,CR Name,Creation Timestamp,Namespace,Expected Version,Reconciled Version,Operator Information,Progress,Progress Message,Reconcile History,Status"
     insertbefore: "BOF"
     state: present
     create: True
@@ -50,8 +50,9 @@
     head -1 {{ _cp4d_get_cr_status_file }}
   register: _csv_column_headers_output
 
+# Between CP4D 5.1.0 and 5.1.1, the Component column has been renamed to Components
 - set_fact:
-    _csv_column_headers: "{{ _csv_column_headers_output.stdout }}"
+    _csv_column_headers: "{{ _csv_column_headers_output.stdout | replace('Component,','Components,') | replace(' ','_') }}"
 
 # Try to copy the get-cr-status output file. In certain situations (Windows, SELinux), the command may fail and has to be re-run without remote_src
 - block:
@@ -75,7 +76,7 @@
 - name: Try to convert to json
   read_csv:
     path: "{{ _cp4d_get_cr_status_no_header_file }}"
-    fieldnames: "{{ _csv_column_headers | replace(' ','_') }}"
+    fieldnames: "{{ _csv_column_headers }}"
     skipinitialspace: True
   register: _get_cr_status_json
 

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
@@ -94,7 +94,7 @@
           }}
     _get_cr_status_json_item: >-
           {{ _get_cr_status_json.list
-            | selectattr('Component','equalto',item['olm_utils_name'])
+            | selectattr('Components','equalto',item['olm_utils_name'])
             | list
             | first
             | default([])
@@ -251,13 +251,13 @@
 - set_fact:
     _obsolete_cartridges: >-
       {{ _get_cr_status_json.list 
-        | rejectattr('Component','in',_surviving_cartridges_names) 
+        | rejectattr('Components','in',_surviving_cartridges_names) 
         | rejectattr('CR_Kind','in',_surviving_cartridges_crs) }}
 
 - set_fact:
     _obsolete_cartridges_names: >-
       {{ _obsolete_cartridges
-        | map(attribute='Component') }}
+        | map(attribute='Components') }}
 
 - debug:
     var: _obsolete_cartridges

diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/vars/vars-cp4d-installation.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/vars/vars-cp4d-installation.yml
@@ -277,6 +277,12 @@ cartridge_cr:
     cr_name: spss-sample
     cr_status_attribute: spssmodelerStatus
     cr_status_completed: Completed
+  - name: streamsets
+    olm_utils_name: streamsets
+    cr_cr: Streamsets
+    cr_name: ibm-streamsets
+    cr_status_attribute: streamsetsStatus
+    cr_status_completed: Complete
   - name: syntheticdata
     olm_utils_name: syntheticdata
     cr_cr: Syntheticdata

diff --git a/docs/src/10-use-deployer/3-run/existing-openshift-console.md b/docs/src/10-use-deployer/3-run/existing-openshift-console.md
@@ -298,6 +298,10 @@ data:
         description: SPSS Modeler
         state: removed
 
+      - name: streamsets
+        description: IBM StreamSets
+        state: removed
+
       - name: syntheticdata
         description: Synthetic Data Generator
         state: removed
@@ -345,6 +349,7 @@ data:
         state: removed
         installation_options:
           tuning_disabled: true
+          lite_install: false
         models:
         - model_id: allam-1-13b-instruct
           state: removed

diff --git a/sample-configurations/sample-dynamic/config-samples/cp4d-510.yaml b/sample-configurations/sample-dynamic/config-samples/cp4d-510.yaml
@@ -273,6 +273,7 @@ cp4d:
     state: removed
     installation_options:
       tuning_disabled: true
+      lite_install: false
     models:
     - model_id: allam-1-13b-instruct
       state: removed