Merge pull request #1098 from IBM/wxo-install-options

#1097 Fix installation options

Author: fketelaars

automation-roles/50-install-cloud-pak/cp4d/cp4d-installation-options/tasks/installation-options-root.yml

@@ -0,0 +1,3 @@
+---
+- set_fact:
+    _added_installation_options: "{{ {} | combine(_cartridge_options) }}"

automation-roles/50-install-cloud-pak/cp4d/cp4d-installation-options/tasks/installation-options-section.yml

@@ -0,0 +1,6 @@
+---
+- set_fact:
+    _cartridge_options: '{{ {} | combine({_cartridge_name: _p_installation_options}) }}'
+
+- set_fact:
+    _added_installation_options: "{{ {} | combine({_p_section: _cartridge_options}) }}"

automation-roles/50-install-cloud-pak/cp4d/cp4d-installation-options/tasks/installation-options.yml

@@ -26,18 +26,12 @@
     _cartridge_name: "{{ _p_current_cp4d_cartridge.installation_options_header | default(_p_cartridge_name) }}"
   when: _p_cp4d_version >= '5.3.0'
 
-- set_fact:
-    _template_file: 'installation-options-root.j2'
+- include_tasks: installation-options-root.yml
   when: (_p_section | default('')) == ''
 
-- set_fact:
-    _template_file: 'installation-options-non-root.j2'
+- include_tasks: installation-options-section.yml
   when: (_p_section | default('')) != ''
 
-- name: Generate new installation options
-  set_fact:
-    _added_installation_options: "{{ lookup('template',_template_file) | from_yaml }}"
-
 - name: Merge new installation options with existing ones
   set_fact:
     _updated_installation_options: "{{ _current_installation_options | combine(_added_installation_options, recursive=True) }}"