Browse Source

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 <dsneddon@redhat.com>

Change-Id: Ia599e01dbefe4e4c752b7d4c1c7e5682963101f7
changes/52/592652/2
Brent Eagles 4 years ago committed by Dan Sneddon
parent
commit
d9fa0ed5b2
  1. 4
      environments/neutron-ovs-dvr.yaml
  2. 4
      network/config/multiple-nics/role.role.j2.yaml
  3. 1
      roles/ComputeDVR.yaml

4
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

4
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:

1
roles/ComputeDVR.yaml

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

Loading…
Cancel
Save