Merge "Remove leftovers after NeutronExternalNetworkBridge option"

deployment/neutron/neutron-l3-container-puppet.yaml

@@ -114,14 +114,6 @@ parameters:
     default: ''
     type: string
 
-  # 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: ''
   NeutronL3AgentExtensions:
     default: ""
     description: |
@@ -135,7 +127,6 @@ conditions:
   radvd_wrapper_enabled: {equals: [{get_param: NeutronEnableRadvdDockerWrapper}, true]}
   docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
   service_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]}
-  external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
   az_unset: {equals: [{get_param: NeutronL3AgentAvailabilityZone}, '']}
   l3_agent_extensions_empty: {equals : [{get_param: NeutronL3AgentExtensions}, "''"]}
 
@@ -213,10 +204,6 @@ outputs:
               '106 neutron_l3 vrrp':
                 proto: vrrp
           -
-            if:
-            - external_network_bridge_empty
-            - {}
-            - neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
           - if:
             - az_unset
             - {}