openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Do not use Neutron resource by default"

This commit is contained in:
Zuul 2022-10-30 13:20:52 +00:00 committed by Gerrit Code Review
parent 6d8e3d94b0 b82f8b415e
commit 93692ed145
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/deployed-network-environment.j2.yaml
View File

@ -12,7 +12,6 @@ resource_registry:
{%- endfor %}
# VIP ports
OS::TripleO::Network::Ports::ControlPlaneVipPort: ../network/ports/deployed_vip_ctlplane.yaml
{%- for network in networks if network.enabled|default(true) and network.vip %}
OS::TripleO::Network::Ports::{{ network.name }}VipPort: ../network/ports/deployed_vip_{{ network.name_lower }}.yaml
{%- endfor %}

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -75,7 +75,7 @@ resource_registry:
OS::TripleO::Network::Ports::{{network.name}}VipPort: network/ports/noop.yaml
{%- endfor %}
OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Neutron::Port
OS::TripleO::Network::Ports::ControlPlaneVipPort: network/ports/deployed_vip_ctlplane.yaml
# Service to network Mappings
OS::TripleO::ServiceNetMap: network/service_net_map.yaml