Merge "Use ansible for default simple ovs bridge config"

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

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

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 %}