#979 Add watsonx Orchestrate installation options

Signed-off-by: Frank Ketelaars <[email protected]>

Author: fketelaars

automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/tasks/cp4d-install-separate-cr.yml

@@ -19,7 +19,7 @@
   - name: Run post-processing scripts
     include_tasks: cp4d-install-cr-post-processing.yml
     when:
-    - _install_cartridges_result.rc==0
+    - (_install_cartridges_result.rc | default(0))==0
 
   when: 
   - (_current_cp4d_cartridge.separate_install | default(False) | bool)

automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/tasks/cp4d-prep-watsonx-orchestrate.yml

@@ -108,10 +108,9 @@
   blockinfile:
     path: "{{ status_dir }}/cp4d/{{ _p_current_cp4d_cluster.project }}-install-options.yml"
     marker: "# {mark} watsonx_orchestrate options #"
-    block: |2
-        watson_orchestrate_install_mode: {{ _current_cp4d_cartridge.installation_options.watson_orchestrate_install_mode | default(omit) }}
-        watsonx_orchestrate_watsonx_ai_type: {{ _current_cp4d_cartridge.installation_options.watsonx_orchestrate_watsonx_ai_type | default(false) }}
-        watson_orchestrate_ootb_models: {{ _current_cp4d_cartridge.installation_options.watson_orchestrate_ootb_models | default([]) }}
+    block: |
+        {{ _current_cp4d_cartridge.installation_options | to_yaml }}
+  when: (_current_cp4d_cartridge.installation_options | default({})) != {}
 
 - block:
   - name: Starting background task to patch OpsManager and RabbitMQCluster. Logs are in {{ status_dir }}/log/{{ _p_current_cp4d_cluster.project }}-wxo-48-patch.log