CI - neutron VIP resource prior to heat stack

When 'network_provision' is enabled run the command
to provsion neutron Virtual IP API resources prior
to creating the heat stack, and include the environment
file to override the stack resource's to use the
'deployed_vip' templates.

Related: blueprint network-data-v2-ports
Depends-On: https://review.opendev.org/779634
Depends-On: https://review.opendev.org/775406
Change-Id: Ic2fefa4d6ed980a74feeb57813e980260b8a5b84
This commit is contained in:
Harald Jensås 2021-02-10 18:07:59 +01:00
parent 3b38acdb12
commit 4bd259ca17
2 changed files with 10 additions and 2 deletions

View File

@ -76,6 +76,7 @@
-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 }}/overcloud-vips-deployed.yaml
-e {{ working_dir }}/network-environment.yaml
when:
- network_isolation_type in ["multi-nic", "multiple-nics"]
@ -89,6 +90,7 @@
-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 }}/overcloud-vips-deployed.yaml
-e {{ working_dir }}/network-environment.yaml
when:
- network_isolation_type in ["multi-nic", "multiple-nics"]

View File

@ -38,10 +38,16 @@ fi
{% endif %}
{% if network_provision|bool %}
# NOTE(hjensas): A dummy file, will be replaced in the follow on change
echo "{}" > {{ working_dir }}/overcloud-vips-deployed.yaml
openstack overcloud network vip provision \
--output {{ working_dir }}/overcloud-vips-deployed.yaml \
--stack {{ stack_name }} \
{{overcloud_templates_path}}/ci/vip_data.yaml
if [ $? -ne 0 ]; then
exit 1
fi
{% endif %}
{% if baremetal_provision|bool %}
## * Provision the baremetal nodes
## ::