openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "Fix network environment ordering"

This commit is contained in:
Zuul 2021-02-24 19:06:05 +00:00 committed by Gerrit Code Review
parent 80c9442b1a 3649a0d143
commit eb9dc674c0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/general_config/featureset001.yml
View File

@ -58,11 +58,11 @@ enable_pacemaker: true
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','rocky','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-isolation-absolute.yaml
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml
# This featureset is extremely resource intensive, so we disable telemetry