diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-11-17 15:40:44 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-11-17 15:40:44 +0000 |
commit | 2f2271a6a32d1b5b8f0008901b5163d65b0dc428 (patch) | |
tree | a7284feb042482eed1cfae70ab096d5a6e53014c /puppet/compute.yaml | |
parent | 49be1648bd937c9901d87c17d527c374ebbc24a2 (diff) | |
parent | e8d1a6a090da90eaf495bb7cab879e6d2e8de20e (diff) |
Merge "Add support for enabling L2 population in Neutron"
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r-- | puppet/compute.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 18547732..c147a0f7 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -85,6 +85,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' @@ -418,6 +423,7 @@ resources: neutron::plugins::ml2::vni_ranges: {get_input: neutron_vni_ranges} neutron_bridge_mappings: {get_input: neutron_bridge_mappings} neutron::agents::ml2::ovs::enable_tunneling: {get_input: neutron_enable_tunneling} + neutron::agents::ml2::ovs::l2_population: {get_input: neutron_enable_l2pop} neutron_physical_bridge: {get_input: neutron_physical_bridge} neutron_public_interface: {get_input: neutron_public_interface} nova::network::neutron::neutron_admin_password: {get_input: neutron_password} @@ -491,6 +497,7 @@ resources: - {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} |