Make config-heat and config-resource options comptatible with OOOQ

The original implementation restricted the usage strictly to infrared, see[1].

[1] https://review.opendev.org/c/openstack/tripleo-upgrade/+/709972

Change-Id: I8a985e496aa0161193becb38ad043835c4c21778

infrared_plugin/main.yml

@@ -261,6 +261,19 @@
             enforce_rhel: true
           when: install.enforce.rhel
 
+        - name: Set parameter_defaults for config_heat_extra.yaml
+          set_fact:
+            config_heat_extra_yaml:
+              parameter_defaults: "{{ install.get('config', {}).get('heat', {}) }}"
+          when: install.get('config', {}).get('heat', {})
+
+        - name: Set resource_registry for config_heat_extra.yaml
+          vars:
+            config_resource: "{{ install.get('config', {}).get('resource', {}) }}"
+          set_fact:
+            config_heat_extra_yaml: "{{ config_heat_extra_yaml | default({}) | combine({'resource_registry': config_resource}) }}"
+          when: install.get('config', {}).get('resource', {})
+
         - name: Enable the execution of  validations
           set_fact:
             run_validations: true

tasks/common/build_extra_template.yaml

@@ -1,19 +1,5 @@
 ---
-- name: set parameter_defaults for config_heat_extra.yaml
-  set_fact:
-      config_heat_extra_yaml:
-          parameter_defaults: "{{ install.get('config', {}).get('heat', {}) }}"
-  when: install.get('config', {}).get('heat', {})
-
-- name: set resource_registry for config_heat_extra.yaml
-  vars:
-      config_resource: "{{ install.get('config', {}).get('resource', {}) }}"
-  set_fact:
-      config_heat_extra_yaml: "{{ config_heat_extra_yaml | default({}) | combine({'resource_registry': config_resource}) }}"
-  when: install.get('config', {}).get('resource', {})
-
 - name: inject config_heat_extra.yaml
   copy:
       dest: "{{ install.deployment.files | basename }}/config_heat_extra.yaml"
       content: "{{ config_heat_extra_yaml | to_nice_yaml }}"
-  when: config_heat_extra_yaml is defined

tasks/fast-forward-upgrade/create-overcloud-ffu-scripts.yaml

@@ -121,10 +121,9 @@
       include_tasks: create-overcloud-ffu-hosts-scripts.yaml
       with_together: "{{ (oc_roles_hosts|dict2items |  default([])) | map(attribute='value') | map('sort') | flatten(1) }}"
 
-# TODO: Not comptatible with oooq
 - name: build extra templates based on new options.
   import_tasks: ../common/build_extra_template.yaml
-  when: not use_oooq|bool
+  when: config_heat_extra_yaml is defined
 
 - name: create overcloud upgrade prepare script
   vars:

tasks/update/create-overcloud-update-scripts.yaml

@@ -18,10 +18,9 @@
 - name: get auxiliary facts for major upgrades
   import_tasks: ../common/auxilary-facts.yaml
 
-# TODO: Not comptatible with oooq
 - name: Build extra templates based on new options.
   import_tasks: ../common/build_extra_template.yaml
-  when: not use_oooq|bool
+  when: config_heat_extra_yaml is defined
 
 - name: create undercloud update script
   template: