openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Do not use Neutron resource by default 

Neutron resources such as port should not be created as part of stack
since we replaced undercloud heat service by ephemeral heat. This
change replaces the default type mapping of ControlPlaneVipPort to
avoid using neutron resources by default.

Change-Id: Ida6dc27c67b9a7c3c1af60c1adbff4bb51e40659
This commit is contained in:
Takashi Kajinami 2022-10-28 17:28:40 +09:00
parent b6b38bce0f
commit b82f8b415e
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