From b12659df86c820d634926a66bb151d31ca6dcfd3 Mon Sep 17 00:00:00 2001 From: ramishra Date: Thu, 22 Apr 2021 08:58:57 +0530 Subject: [PATCH] Provision networks prior to heat stack in fs002 Related-Bug: #1925367 Change-Id: I81d098822af34f16f532aa48fa57025d29c511da --- config/general_config/featureset002.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config/general_config/featureset002.yml b/config/general_config/featureset002.yml index 9cc529396..ee03ee9f0 100644 --- a/config/general_config/featureset002.yml +++ b/config/general_config/featureset002.yml @@ -59,6 +59,14 @@ baremetal_provision: >- true {%- endif -%} +# Provision composable networks prior to creating the heat stack +network_provision: >- + {% if release in ['newton','ocata','pike','queens','stein','train','ussuri','victoria'] -%} + false + {%- else -%} + true + {%- endif -%} + undercloud_inspection_extras: false undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" @@ -71,6 +79,10 @@ network_isolation: true network_isolation_type: "multiple-nics" network_isolation_args: >- -e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-isolation-absolute.yaml + {% if not release in ['newton','ocata','pike','queens','stein','train','ussuri','victoria'] -%} + --networks-file {{ overcloud_templates_path }}/ci/network_data.yaml + -e {{ working_dir }}/overcloud-networks-deployed.yaml + {% endif %} -e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml # This featureset is extremely resource intensive, so we disable telemetry