aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/neutron-l3-compute-dvr.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-02 05:12:41 +0000
committerGerrit Code Review <review@openstack.org>2017-03-02 05:12:41 +0000
commit74a99e72828c2bda46c856fc4983ad1ae1a4472f (patch)
treea3288b8285a325c8bb30902989a9a9f752110a68 /puppet/services/neutron-l3-compute-dvr.yaml
parent6bda18b16af5004e9d34a583806bc80b0554b188 (diff)
parentfd3ac00879b4456564711c6599f5542602641b33 (diff)
Merge "neutron: don't set external_network_bridge option by default" into stable/ocata
Diffstat (limited to 'puppet/services/neutron-l3-compute-dvr.yaml')
-rw-r--r--puppet/services/neutron-l3-compute-dvr.yaml25
1 files changed, 19 insertions, 6 deletions
diff --git a/puppet/services/neutron-l3-compute-dvr.yaml b/puppet/services/neutron-l3-compute-dvr.yaml
index 06927fe0..1d6a2371 100644
--- a/puppet/services/neutron-l3-compute-dvr.yaml
+++ b/puppet/services/neutron-l3-compute-dvr.yaml
@@ -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