Merge "Remove External network from DVR related configuration"

environments/neutron-ovs-dvr.yaml

@@ -9,10 +9,6 @@ resource_registry:
   # bridge to be connected to a physical network.
   OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
 
-  # When using defaults, DVR requires access to the External API network
-  # for floating IP access. Please check your configuration to ensure that
-  # networks are configured appropriately.
-
 parameter_defaults:
 
   # DVR requires that the L2 population feature is enabled

network/config/multiple-nics/role.role.j2.yaml

@@ -107,15 +107,13 @@ resources:
                 - ip_netmask:
                     get_param: {{network.name}}IpSubnet
 {%- endif %}
-{%- elif network.name in role.networks or role.name == 'Networker' %}
+{%- elif network.name in role.networks or role.name == 'Networker' or role.name == 'ComputeDVR' %}
               - type: ovs_bridge
 {%- if network.name == "External" %}
                 name: bridge_name
 {%- else %}
                 name: br-{{network.name_lower}}
 {%- endif %}
-                dns_servers:
-                  get_param: DnsServers
                 use_dhcp: false
 {%- if network.name in role.networks %}
                 addresses:

roles/ComputeDVR.yaml

@@ -9,7 +9,6 @@
     - InternalApi
     - Tenant
     - Storage
-    - External
   HostnameFormatDefault: '%stackname%-novacompute-dvr-%index%'
   RoleParametersDefault:
     TunedProfileName: "virtual-host"