2 files changed, 14 insertions, 0 deletions
diff --git a/os-apply-config/compute.yaml b/os-apply-config/compute.yaml
index ee55c587..c829248b 100644
--- a/os-apply-config/compute.yaml
+++ b/os-apply-config/compute.yaml
@@ -125,6 +125,11 @@ parameters:
   NeutronEnableTunnelling:
     type: string
     default: "True"
+  NeutronEnableL2Pop:
+    type: string
+    description: >
+        Enable/disable the L2 population feature in the Neutron agents.
+    default: "False"
   NeutronFlatNetworks:
     type: string
     default: 'datacentre'
@@ -404,6 +409,7 @@ resources:
             vni_ranges: {get_input: neutron_vni_ranges}
             bridge_mappings: {get_input: neutron_bridge_mappings}
             enable_tunneling: {get_input: neutron_enable_tunneling}
+            l2_population: {get_input: neutron_enable_l2pop}
             physical_bridge: {get_input: neutron_physical_bridge}
             public_interface: {get_input: neutron_public_interface}
             public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
@@ -463,6 +469,7 @@ resources:
         neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges}
         neutron_bridge_mappings: {get_param: NeutronBridgeMappings}
         neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
+        neutron_enable_l2pop: {get_param: NeutronEnableL2Pop}
         neutron_physical_bridge: {get_param: NeutronPhysicalBridge}
         neutron_public_interface: {get_param: NeutronPublicInterface}
         neutron_password: {get_param: NeutronPassword}
diff --git a/os-apply-config/controller.yaml b/os-apply-config/controller.yaml
index 09ea49b8..f84bf5b3 100644
--- a/os-apply-config/controller.yaml
+++ b/os-apply-config/controller.yaml
@@ -358,6 +358,11 @@ parameters:
   NeutronEnableTunnelling:
     type: string
     default: "True"
+  NeutronEnableL2Pop:
+    type: string
+    description: >
+        Enable/disable the L2 population feature in the Neutron agents.
+    default: "False"
   NeutronFlatNetworks:
     type: string
     default: 'datacentre'
@@ -722,6 +727,7 @@ resources:
           dhcp_agents_per_network: {get_input: neutron_dhcp_agents_per_network}
           ovs:
             enable_tunneling: {get_input: neutron_enable_tunneling}
+            l2_population: {get_input: neutron_enable_l2pop}
             local_ip: {get_input: controller_host}
             network_vlan_ranges: {get_input: neutron_network_vlan_ranges}
             bridge_mappings: {get_input: neutron_bridge_mappings}
@@ -881,6 +887,7 @@ resources:
         controller_host: {get_attr: [Controller, networks, ctlplane, 0]}
         controller_virtual_ip: {get_param: VirtualIP}
         neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
+        neutron_enable_l2pop: {get_param: NeutronEnableL2Pop}
         heat.watch_server_url:
           list_join:
             - ''