Merge "Remove external_network_bridge Neutron option"

puppet/services/neutron-l3-compute-dvr.yaml

@@ -40,18 +40,6 @@ 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:
 
@@ -75,11 +63,6 @@ outputs:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
           - neutron::agents::l3::agent_mode : 'dvr'
-          -
-            if:
-            - external_network_bridge_empty
-            - {}
-            - neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
         service_config_settings:
           fluentd:
             tripleo_fluentd_groups_neutron_l3_compute_dvr:

puppet/services/neutron-l3.yaml

@@ -61,18 +61,8 @@ 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:
   service_debug_unset: {equals: [{get_param: NeutronL3AgentDebug}, '']}
-  external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
 
 resources:
 
@@ -119,11 +109,6 @@ outputs:
           tripleo::neutron_l3::firewall_rules:
             '106 neutron_l3 vrrp':
               proto: vrrp
-        -
-          if:
-          - external_network_bridge_empty
-          - {}
-          - neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
       service_config_settings:
         fluentd:
           tripleo_fluentd_groups_neutron_l3:

releasenotes/notes/remove-neutron-external-bridge-parameter-a0c7e7ff8d937541.yaml

@@ -0,0 +1,6 @@
+---
+other:
+  - |
+    Remove ``NeutronExternalNetworkBridge`` Heat parameter.
+    Option ``external_network_bridge`` is deprecated and should not be used
+    in Neutron.