openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

CI - Fix the environment ordering 

The overcloud-networks-deployed.yaml must be added after
environments/network-isolation.yaml so that resource's
are actually overriden.

Change-Id: I72c9e16588fd4fa1c90c5835907ff552fab7132e
Related: blueprint network-data-v2
This commit is contained in:
Harald Jensås 2021-03-10 01:58:18 +01:00
parent d7e9ca5ba2
commit 4a4f64b89d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/overcloud-deploy/tasks/pre-deploy.yml
View File

@ -73,9 +73,9 @@
set_fact:
network_isolation_args: >-
--networks-file {{ overcloud_templates_path }}/ci/network_data.yaml
-e {{ working_dir }}/overcloud-networks-deployed.yaml
-e {{ overcloud_templates_path }}/environments/network-isolation.yaml
-e {{ overcloud_templates_path }}/environments/net-multiple-nics.yaml
-e {{ working_dir }}/overcloud-networks-deployed.yaml
-e {{ working_dir }}/network-environment.yaml
when:
- network_isolation_type in ["multi-nic", "multiple-nics"]
@ -86,9 +86,9 @@
set_fact:
network_isolation_args: >-
--networks-file {{ overcloud_templates_path }}/ci/network_data.yaml
-e {{ working_dir }}/overcloud-networks-deployed.yaml
-e {{ overcloud_templates_path }}/environments/network-isolation-v6.yaml
-e {{ overcloud_templates_path }}/environments/net-multiple-nics-v6.yaml
-e {{ working_dir }}/overcloud-networks-deployed.yaml
-e {{ working_dir }}/network-environment.yaml
when:
- network_isolation_type in ["multi-nic", "multiple-nics"]