diff options
| author |   Brent Eagles <beagles@redhat.com> | 2015-11-12 11:26:53 -0330 |
|---|---|---|
| committer | Brent Eagles <beagles@redhat.com> | 2015-11-16 11:15:33 -0330 |
| commit | e8d1a6a090da90eaf495bb7cab879e6d2e8de20e (patch) | |
| tree | 2667929b8b2e84a1149cef5e6cff4d4b3bcdc747 /puppet | |
| parent | 5eee49bd730b780dc27bb913f3181a816dd27eda (diff) | |
Add support for enabling L2 population in Neutron
This change adds support for enabling/disabling L2 population in
Neutron agents. It currently defaults to false.
Change-Id: I3dd19feb4acb1046bc560b35e5a7a111364ea0d7
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/compute.yaml | 7 | ||||
| -rw-r--r-- | puppet/controller.yaml | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 07638fb9..52a856f0 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -93,6 +93,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' @@ -421,6 +426,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} @@ -506,6 +512,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} diff --git a/puppet/controller.yaml b/puppet/controller.yaml index af673d7a..3c6c4eeb 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -377,6 +377,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' @@ -709,6 +714,7 @@ resources: input_values: bootstack_nodeid: {get_attr: [Controller, name]} neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} + neutron_enable_l2pop: {get_param: NeutronEnableL2Pop} haproxy_log_address: {get_param: HAProxySyslogAddress} heat.watch_server_url: list_join: @@ -1208,6 +1214,7 @@ resources: neutron::server::database_connection: {get_input: neutron_dsn} neutron::agents::l3::external_network_bridge: {get_input: neutron_external_network_bridge} neutron::agents::ml2::ovs::enable_tunneling: {get_input: neutron_enable_tunneling} + neutron::agents::ml2::ovs::l2_population: {get_input: neutron_enable_l2pop} neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip} neutron_flat_networks: {get_input: neutron_flat_networks} neutron::agents::metadata::shared_secret: {get_input: neutron_metadata_proxy_shared_secret} |