From d9fa0ed5b28f15d38b24da5112c60aa2a31bf015 Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Thu, 16 Aug 2018 16:20:19 -0230 Subject: [PATCH] Remove External network from DVR related configuration DVR doesn't imply the "External" networks, simply some type of connection that is being used for floating IP traffic. This patch removes the External network from the DVR role and "left overs" from environment files. It also corrects the multiple-nics version of the templates so that the ComputeDVR role is attached to the external bridge with no IP. Co-Authored-By: Dan Sneddon Change-Id: Ia599e01dbefe4e4c752b7d4c1c7e5682963101f7 --- environments/neutron-ovs-dvr.yaml | 4 ---- network/config/multiple-nics/role.role.j2.yaml | 4 +--- roles/ComputeDVR.yaml | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml index 13e5a5f0e7..f0e98be814 100644 --- a/environments/neutron-ovs-dvr.yaml +++ b/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 diff --git a/network/config/multiple-nics/role.role.j2.yaml b/network/config/multiple-nics/role.role.j2.yaml index fa0a1f40d3..e2a2feeabe 100644 --- a/network/config/multiple-nics/role.role.j2.yaml +++ b/network/config/multiple-nics/role.role.j2.yaml @@ -99,15 +99,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: diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index aa7b214a1d..559f82d3a3 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -9,7 +9,6 @@ - InternalApi - Tenant - Storage - - External HostnameFormatDefault: '%stackname%-novacompute-dvr-%index%' RoleParametersDefault: TunedProfileName: "virtual-host"