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
(cherry picked from commit e8d1a6a090
)
This commit is contained in:
parent
36dbd7fcd6
commit
a88e8aefb6
|
@ -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}
|
||||
|
|
|
@ -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'
|
||||
|
@ -725,6 +730,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}
|
||||
|
@ -884,6 +890,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:
|
||||
- ''
|
||||
|
|
|
@ -116,6 +116,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'
|
||||
|
@ -830,6 +835,7 @@ resources:
|
|||
NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
|
||||
NeutronExternalNetworkBridge: {get_param: NeutronExternalNetworkBridge}
|
||||
NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling}
|
||||
NeutronEnableL2Pop: {get_param: NeutronEnableL2Pop}
|
||||
NeutronNetworkVLANRanges: {get_param: NeutronNetworkVLANRanges}
|
||||
NeutronPublicInterface: {get_param: NeutronPublicInterface}
|
||||
NeutronPublicInterfaceDefaultRoute: {get_param: NeutronPublicInterfaceDefaultRoute}
|
||||
|
@ -918,6 +924,7 @@ resources:
|
|||
KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
|
||||
NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
|
||||
NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling}
|
||||
NeutronEnableL2Pop : {get_param: NeutronEnableL2Pop}
|
||||
NeutronFlatNetworks: {get_param: NeutronFlatNetworks}
|
||||
NeutronHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
|
||||
NeutronNetworkType: {get_param: NeutronNetworkType}
|
||||
|
|
|
@ -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'
|
||||
|
@ -441,6 +446,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}
|
||||
|
@ -517,6 +523,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}
|
||||
|
|
|
@ -360,6 +360,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'
|
||||
|
@ -710,6 +715,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:
|
||||
|
@ -1163,6 +1169,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}
|
||||
|
|
Loading…
Reference in New Issue