From b82f8b415e4d785ce1a8d2c0fa45a25f31148509 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 28 Oct 2022 17:28:40 +0900 Subject: [PATCH] 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 --- environments/deployed-network-environment.j2.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/environments/deployed-network-environment.j2.yaml b/environments/deployed-network-environment.j2.yaml index 9fb6d2d694..de29dece07 100644 --- a/environments/deployed-network-environment.j2.yaml +++ b/environments/deployed-network-environment.j2.yaml @@ -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 %} diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 53bf09d84d..ac9c7cf227 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -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