diff options
author | 2015-11-17 15:40:44 +0000 | |
---|---|---|
committer | 2015-11-17 15:40:44 +0000 | |
commit | 2f2271a6a32d1b5b8f0008901b5163d65b0dc428 (patch) | |
tree | a7284feb042482eed1cfae70ab096d5a6e53014c /os-apply-config/controller.yaml | |
parent | 49be1648bd937c9901d87c17d527c374ebbc24a2 (diff) | |
parent | e8d1a6a090da90eaf495bb7cab879e6d2e8de20e (diff) |
Merge "Add support for enabling L2 population in Neutron"
Diffstat (limited to 'os-apply-config/controller.yaml')
-rw-r--r-- | os-apply-config/controller.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
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: - '' |