openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "CI - Fix the environment ordering"

Browse Source
This commit is contained in:
Zuul 2021-03-26 08:38:00 +00:00 committed by Gerrit Code Review
commit 406b7e246c
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: set_fact:
network_isolation_args: >- network_isolation_args: >-
--networks-file {{ overcloud_templates_path }}/ci/network_data.yaml --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/network-isolation.yaml
-e {{ overcloud_templates_path }}/environments/net-multiple-nics.yaml -e {{ overcloud_templates_path }}/environments/net-multiple-nics.yaml
-e {{ working_dir }}/overcloud-networks-deployed.yaml
-e {{ working_dir }}/network-environment.yaml -e {{ working_dir }}/network-environment.yaml
when: when:
- network_isolation_type in ["multi-nic", "multiple-nics"] - network_isolation_type in ["multi-nic", "multiple-nics"]
@ -86,9 +86,9 @@
set_fact: set_fact:
network_isolation_args: >- network_isolation_args: >-
--networks-file {{ overcloud_templates_path }}/ci/network_data.yaml --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/network-isolation-v6.yaml
-e {{ overcloud_templates_path }}/environments/net-multiple-nics-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 -e {{ working_dir }}/network-environment.yaml
when: when:
- network_isolation_type in ["multi-nic", "multiple-nics"] - network_isolation_type in ["multi-nic", "multiple-nics"]