Merge "Enable ephemeral heat for fs001, fs002 and fs039"

config/general_config/featureset001.yml

@@ -125,6 +125,9 @@ config_download_args: >-
   --verbose
   {%- endif -%}
 
+ephemeral_heat: "{{ (release not in ['train','ussuri','victoria']) | bool }}"
+ephemeral_heat_args: "{{ '--heat-type pod' if ephemeral_heat|bool else '' }}"
+
 # Tempest configuration, keep always at the end of the file
 # Use the traditional ping test in newton, ocata and pike
 # Run tempest in queens+

config/general_config/featureset002.yml

@@ -12,7 +12,13 @@ step_introspect: true
 # TODO(gcerami) tripleo-ci specific content. This has to be implemented in another way
 to_build: true
 # Delete the overcloud after deployment
-step_delete_overcloud: true
+step_delete_overcloud: >-
+  {% if release in ['train','ussuri','victoria'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+
 undercloud_check_idempotency: false
 
 # This enables container deployements after Pike
@@ -116,7 +122,7 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - overcloud-delete
+    - "{% if release in ['train','ussuri','victoria'] -%}overcloud-delete{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -130,7 +136,7 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - overcloud-delete
+    - "{% if release in ['train','ussuri','victoria'] -%}overcloud-delete{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -145,6 +151,9 @@ config_download_args: >-
   --verbose
   {%- endif -%}
 
+ephemeral_heat: "{{ (release not in ['train','ussuri','victoria']) | bool }}"
+ephemeral_heat_args: "{{ '--heat-type pod' if ephemeral_heat|bool else '' }}"
+
 # Tempest configuration, keep always at the end of the file
 # Use the traditional ping test in newton, ocata and pike
 # Run tempest in queens+

config/general_config/featureset027.yml

@@ -75,6 +75,8 @@ use_os_tempest: >-
   false
   {%- endif -%}
 
+ephemeral_heat: "{{ (release not in ['train','ussuri','victoria']) | bool }}"
+
 tempest_install_method: distro
 tempest_cloud_name: 'undercloud'
 # There is no external network used for so disabling neutron

config/general_config/featureset039.yml

@@ -54,7 +54,13 @@ enable_pacemaker: true
 network_isolation: true
 network_isolation_type: "multiple-nics"
 network_isolation_args: >-
+  {% if not release in ['train','ussuri','victoria'] -%}
+  --networks-file {{ overcloud_templates_path }}/ci/network_data.yaml
+  -e {{ working_dir }}/overcloud-networks-deployed.yaml
+  -e {{ working_dir }}/overcloud-vips-deployed.yaml
+  {% else %}
   -e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-isolation-absolute.yaml
+  {% endif %}
   -e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml
 
 # This featureset is extremely resource intensive, so we disable telemetry
@@ -119,6 +125,9 @@ config_download_args: >-
   --verbose
   {%- endif -%}
 
+ephemeral_heat: "{{ (release not in ['train','ussuri','victoria']) | bool }}"
+ephemeral_heat_args: "{{ '--heat-type pod' if ephemeral_heat|bool else '' }}"
+
 # Tempest configuration, keep always at the end of the file
 # Use the traditional ping test in newton, ocata and pike
 # Run tempest in queens+
@@ -192,6 +201,14 @@ baremetal_provision: >-
   true
   {%- endif -%}
 
+# Provision composable networks prior to creating the heat stack
+network_provision: >-
+  {% if release in ['train','ussuri','victoria'] -%}
+  false
+  {%- else -%}
+  true
+  {%- endif -%}
+
 # TLS everywhere related vars. #
 enable_tls_everywhere: true
 novajoin_connect_timeout: 60