Merge "neutron: don't set external_network_bridge option by default"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
67b14a5996
@ -20,7 +20,3 @@ resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller-no-external.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/ceph-storage.yaml
|
||||
|
||||
# NOTE: with no external interface we should be able to use the
|
||||
# default Neutron l3_agent.ini setting for the external bridge (br-ex)
|
||||
# i.e. No need to set: NeutronExternalNetworkBridge: "''"
|
||||
|
||||
@ -12,9 +12,3 @@ resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller-v6.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/ceph-storage.yaml
|
||||
|
||||
parameter_defaults:
|
||||
# This sets 'external_network_bridge' in l3_agent.ini to an empty string
|
||||
# so that external networks act like provider bridge networks (they
|
||||
# will plug into br-int instead of br-ex)
|
||||
NeutronExternalNetworkBridge: "''"
|
||||
|
||||
@ -11,9 +11,3 @@ resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/ceph-storage.yaml
|
||||
|
||||
parameter_defaults:
|
||||
# This sets 'external_network_bridge' in l3_agent.ini to an empty string
|
||||
# so that external networks act like provider bridge networks (they
|
||||
# will plug into br-int instead of br-ex)
|
||||
NeutronExternalNetworkBridge: "''"
|
||||
|
||||
@ -11,9 +11,3 @@ resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/controller.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml
|
||||
|
||||
parameter_defaults:
|
||||
# This sets 'external_network_bridge' in l3_agent.ini to an empty string
|
||||
# so that external networks act like provider bridge networks (they
|
||||
# will plug into br-int instead of br-ex)
|
||||
NeutronExternalNetworkBridge: "''"
|
||||
|
||||
@ -19,7 +19,3 @@ resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller-no-external.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/ceph-storage.yaml
|
||||
|
||||
# NOTE: with no external interface we should be able to use the
|
||||
# default Neutron l3_agent.ini setting for the external bridge (br-ex)
|
||||
# i.e. No need to set: NeutronExternalNetworkBridge: "''"
|
||||
|
||||
@ -11,9 +11,3 @@ resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller-v6.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/ceph-storage.yaml
|
||||
|
||||
parameter_defaults:
|
||||
# This sets 'external_network_bridge' in l3_agent.ini to an empty string
|
||||
# so that external networks act like provider bridge networks (they
|
||||
# will plug into br-int instead of br-ex)
|
||||
NeutronExternalNetworkBridge: "''"
|
||||
|
||||
@ -11,9 +11,3 @@ resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/ceph-storage.yaml
|
||||
|
||||
parameter_defaults:
|
||||
# This sets 'external_network_bridge' in l3_agent.ini to an empty string
|
||||
# so that external networks act like provider bridge networks (they
|
||||
# will plug into br-int instead of br-ex)
|
||||
NeutronExternalNetworkBridge: "''"
|
||||
|
||||
@ -48,8 +48,6 @@ parameter_defaults:
|
||||
# ManagementInterfaceDefaultRoute: 10.0.1.1
|
||||
# Define the DNS servers (maximum 2) for the overcloud nodes
|
||||
DnsServers: ["8.8.8.8","8.8.4.4"]
|
||||
# Set to empty string to enable multiple external networks or VLANs
|
||||
NeutronExternalNetworkBridge: "''"
|
||||
# List of Neutron network types for tenant networks (will be used in order)
|
||||
NeutronNetworkType: 'vxlan,vlan'
|
||||
# The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
|
||||
|
||||
@ -22,10 +22,6 @@ parameters:
|
||||
Debug:
|
||||
type: string
|
||||
default: ''
|
||||
NeutronExternalNetworkBridge:
|
||||
description: Name of bridge used for external network traffic.
|
||||
type: string
|
||||
default: 'br-ex'
|
||||
MonitoringSubscriptionNeutronL3Dvr:
|
||||
default: 'overcloud-neutron-l3-dvr'
|
||||
type: string
|
||||
@ -35,6 +31,19 @@ parameters:
|
||||
tag: openstack.neutron.agent.l3-compute
|
||||
path: /var/log/neutron/l3-agent.log
|
||||
|
||||
# DEPRECATED: the following options are deprecated and are currently maintained
|
||||
# for backwards compatibility. They will be removed in the Pike cycle.
|
||||
NeutronExternalNetworkBridge:
|
||||
description: Name of bridge used for external network traffic. Usually L2
|
||||
agent handles port wiring into external bridge, and hence the
|
||||
parameter should be unset.
|
||||
type: string
|
||||
default: ''
|
||||
|
||||
conditions:
|
||||
|
||||
external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
|
||||
|
||||
resources:
|
||||
|
||||
NeutronBase:
|
||||
@ -56,7 +65,11 @@ outputs:
|
||||
config_settings:
|
||||
map_merge:
|
||||
- get_attr: [NeutronBase, role_data, config_settings]
|
||||
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
|
||||
neutron::agents::l3::agent_mode : 'dvr'
|
||||
- neutron::agents::l3::agent_mode : 'dvr'
|
||||
-
|
||||
if:
|
||||
- external_network_bridge_empty
|
||||
- {}
|
||||
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::l3
|
||||
|
||||
@ -21,10 +21,6 @@ parameters:
|
||||
Debug:
|
||||
type: string
|
||||
default: ''
|
||||
NeutronExternalNetworkBridge:
|
||||
description: Name of bridge used for external network traffic.
|
||||
type: string
|
||||
default: 'br-ex'
|
||||
NeutronL3AgentMode:
|
||||
description: |
|
||||
Agent mode for L3 agent. Must be one of legacy or dvr_snat.
|
||||
@ -43,6 +39,15 @@ parameters:
|
||||
tag: openstack.neutron.agent.l3
|
||||
path: /var/log/neutron/l3-agent.log
|
||||
|
||||
# DEPRECATED: the following options are deprecated and are currently maintained
|
||||
# for backwards compatibility. They will be removed in the Pike cycle.
|
||||
NeutronExternalNetworkBridge:
|
||||
description: Name of bridge used for external network traffic. Usually L2
|
||||
agent handles port wiring into external bridge, and hence the
|
||||
parameter should be unset.
|
||||
type: string
|
||||
default: ''
|
||||
|
||||
conditions:
|
||||
|
||||
external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user