openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Use network-v2 workflow for Controlplane VIP"

This commit is contained in:
Zuul 2021-11-01 19:48:01 +00:00 committed by Gerrit Code Review
parent 8effe5ba78 5c39f7b16c
commit 982e295c77
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
roles/overcloud-deploy/templates/config-download.yaml.j2
View File

@ -1,10 +1,5 @@
resource_registry:
OS::TripleO::DeployedServer::ControlPlanePort: /usr/share/openstack-tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml
{% if release not in ['train', 'ussuri', 'victoria'] %}
# Starting with wallaby with ephemeral Heat, we want to override the default
# mapping for ControlPlaneVipPort so that Neutron is not used.
OS::TripleO::Network::Ports::ControlPlaneVipPort: /usr/share/openstack-tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml
{% endif %}
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
OS::TripleO::OVNMacAddressPort: OS::Heat::None
@ -25,14 +20,6 @@ parameter_defaults:
{% endif %}
DeployedServerPortMap:
control_virtual_ip:
fixed_ips:
- ip_address: 192.168.24.100
subnets:
- cidr: 192.168.24.0/24
network:
tags:
- 192.168.24.0/24
{% for subnode in groups['overcloud'] %}
{{ hostvars[subnode]['ansible_hostname'] }}-ctlplane:
fixed_ips: