diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-23 00:06:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-23 00:06:28 +0000 |
| commit | 67b14a599689178fbee31068231d636baeacb606 (patch) | |
| tree | 58f590b097f458392969e14f95c3700c2c201f1d /puppet/services/neutron-l3-compute-dvr.yaml | |
| parent | 758eeff854cd40a0e86a584a462bac68715b0548 (diff) | |
| parent | 21d2afd4bf9f57fd0fb3709d87acb452f13912df (diff) | |
Merge "neutron: don't set external_network_bridge option by default"
Diffstat (limited to 'puppet/services/neutron-l3-compute-dvr.yaml')
| -rw-r--r-- | puppet/services/neutron-l3-compute-dvr.yaml | 25 |
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 |