From ebef16836eb0230711e194de3e8e56289226210f Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Tue, 6 Oct 2020 10:32:41 +0530 Subject: [PATCH] Use ansible for default simple ovs bridge config Change-Id: I28892e638f30321b271ceaf54b60020a43ceebb6 --- environments/neutron-ovs-dvr.yaml | 3 ++- environments/services/neutron-ovs-dvr.yaml | 3 ++- overcloud-resource-registry-puppet.j2.yaml | 7 +------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml index 5a0423e80f..abe9a78def 100644 --- a/environments/neutron-ovs-dvr.yaml +++ b/environments/neutron-ovs-dvr.yaml @@ -19,7 +19,8 @@ resource_registry: # With using default template values, the Compute nodes also need the br-ex # bridge to be connected to a physical network. - OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml + ComputeNetworkConfigWithAnsible: true + ComputeNetworkConfigTemplate: 'templates/net_config_bridge.j2' # Disable OVN services OS::TripleO::Services::OVNController: OS::Heat::None diff --git a/environments/services/neutron-ovs-dvr.yaml b/environments/services/neutron-ovs-dvr.yaml index c3630a33ec..6d0f2668f9 100644 --- a/environments/services/neutron-ovs-dvr.yaml +++ b/environments/services/neutron-ovs-dvr.yaml @@ -14,7 +14,8 @@ resource_registry: OS::TripleO::Services::NeutronL3Agent: ../../deployment/neutron/neutron-l3-container-puppet.yaml OS::TripleO::Services::ComputeNeutronL3Agent: ../../deployment/neutron/neutron-l3-container-puppet.yaml OS::TripleO::Services::ComputeNeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml - OS::TripleO::ComputeDVR::Net::SoftwareConfig: ../../net-config-bridge.yaml + ComputeDVRNetworkConfigWithAnsible: true + ComputeDVRNetworkConfigTemplate: 'templates/net_config_bridge.j2' # Disable OVN services OS::TripleO::Services::OVNController: OS::Heat::None diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 17cff4c12b..8de66d633c 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -14,16 +14,11 @@ resource_registry: OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None OS::TripleO::Tasks::{{role.name}}PostConfig: OS::Heat::None OS::TripleO::{{role.name}}ExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml + OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None # Port assignments for the {{role.name}} role {%- for network in networks if network.enabled|default(true) and network.name in role.networks|default([]) %} OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: network/ports/noop.yaml {%- endfor %} - {%- if 'external_bridge' in role.tags %} - # Create Neutron external bridge for floating IPs and/or SNAT - OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-bridge.yaml - {%- else %} - OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None - {%- endif %} {% endfor %} {% for role in roles %}