Add support for Neutron l3_ha option in puppet templates
With this change we wire the NeutronL3HA parameter to the puppet class, where needed. Change-Id: I37b3850f71885a93859b5e51925df379616fc6ab
This commit is contained in:
parent
3eb3134c26
commit
fed9d001cc
|
@ -168,10 +168,12 @@ parameters:
|
||||||
The mechanism drivers for the Neutron tenant network. To specify multiple
|
The mechanism drivers for the Neutron tenant network. To specify multiple
|
||||||
values, use a comma separated string, like so: 'openvswitch,l2_population'
|
values, use a comma separated string, like so: 'openvswitch,l2_population'
|
||||||
type: string
|
type: string
|
||||||
|
# Not relevant for Computes, should be removed
|
||||||
NeutronAllowL3AgentFailover:
|
NeutronAllowL3AgentFailover:
|
||||||
default: 'True'
|
default: 'True'
|
||||||
description: Allow automatic l3-agent failover
|
description: Allow automatic l3-agent failover
|
||||||
type: string
|
type: string
|
||||||
|
# Not relevant for Computes, should be removed
|
||||||
NeutronL3HA:
|
NeutronL3HA:
|
||||||
default: 'False'
|
default: 'False'
|
||||||
description: Whether to enable l3-agent HA
|
description: Whether to enable l3-agent HA
|
||||||
|
|
|
@ -625,6 +625,7 @@ resources:
|
||||||
NeutronAgentMode: {get_param: NeutronComputeAgentMode}
|
NeutronAgentMode: {get_param: NeutronComputeAgentMode}
|
||||||
NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice}
|
NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice}
|
||||||
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
|
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
|
||||||
|
# L3 HA and Failover is not relevant for Computes, should be removed
|
||||||
NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover}
|
NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover}
|
||||||
NeutronL3HA: {get_param: NeutronL3HA}
|
NeutronL3HA: {get_param: NeutronL3HA}
|
||||||
NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
|
NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
|
||||||
|
|
|
@ -168,11 +168,13 @@ parameters:
|
||||||
The mechanism drivers for the Neutron tenant network. To specify multiple
|
The mechanism drivers for the Neutron tenant network. To specify multiple
|
||||||
values, use a comma separated string, like so: 'openvswitch,l2_population'
|
values, use a comma separated string, like so: 'openvswitch,l2_population'
|
||||||
type: string
|
type: string
|
||||||
|
# Not relevant for Computes, should be removed
|
||||||
NeutronAllowL3AgentFailover:
|
NeutronAllowL3AgentFailover:
|
||||||
default: 'True'
|
default: 'True'
|
||||||
description: Allow automatic l3-agent failover
|
description: Allow automatic l3-agent failover
|
||||||
type: string
|
type: string
|
||||||
NeutronL3HA: #FIXME this isn't wired in
|
# Not relevant for Computes, should be removed
|
||||||
|
NeutronL3HA:
|
||||||
default: 'False'
|
default: 'False'
|
||||||
description: Whether to enable l3-agent HA
|
description: Whether to enable l3-agent HA
|
||||||
type: string
|
type: string
|
||||||
|
@ -319,8 +321,6 @@ resources:
|
||||||
neutron_agent_mode: {get_input: neutron_agent_mode}
|
neutron_agent_mode: {get_input: neutron_agent_mode}
|
||||||
neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
|
neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
|
||||||
neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}
|
neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}
|
||||||
neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
|
|
||||||
neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
|
|
||||||
neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
|
neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
|
||||||
admin_password: {get_input: admin_password}
|
admin_password: {get_input: admin_password}
|
||||||
nova::rabbit_host: {get_input: rabbit_host}
|
nova::rabbit_host: {get_input: rabbit_host}
|
||||||
|
@ -383,7 +383,6 @@ resources:
|
||||||
neutron_router_distributed: {get_param: NeutronDVR}
|
neutron_router_distributed: {get_param: NeutronDVR}
|
||||||
neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
|
neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
|
||||||
neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers}
|
neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers}
|
||||||
neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
|
|
||||||
neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
|
neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
|
||||||
neutron_url:
|
neutron_url:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -242,6 +242,10 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: ''
|
||||||
description: If set, flat networks to configure in neutron plugins.
|
description: If set, flat networks to configure in neutron plugins.
|
||||||
|
NeutronL3HA:
|
||||||
|
default: 'False'
|
||||||
|
description: Whether to enable l3-agent HA
|
||||||
|
type: string
|
||||||
NeutronNetworkType:
|
NeutronNetworkType:
|
||||||
default: 'gre'
|
default: 'gre'
|
||||||
description: The tenant network type for Neutron, either gre or vxlan.
|
description: The tenant network type for Neutron, either gre or vxlan.
|
||||||
|
@ -516,6 +520,7 @@ resources:
|
||||||
neutron_router_distributed: {get_param: NeutronDVR}
|
neutron_router_distributed: {get_param: NeutronDVR}
|
||||||
neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers}
|
neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers}
|
||||||
neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
|
neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
|
||||||
|
neutron_l3_ha: {get_param: NeutronL3HA}
|
||||||
neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges}
|
neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges}
|
||||||
neutron_bridge_mappings: {get_param: NeutronBridgeMappings}
|
neutron_bridge_mappings: {get_param: NeutronBridgeMappings}
|
||||||
neutron_public_interface: {get_param: NeutronPublicInterface}
|
neutron_public_interface: {get_param: NeutronPublicInterface}
|
||||||
|
@ -714,6 +719,7 @@ resources:
|
||||||
neutron_router_distributed: {get_input: neutron_router_distributed}
|
neutron_router_distributed: {get_input: neutron_router_distributed}
|
||||||
neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}
|
neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}
|
||||||
neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
|
neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
|
||||||
|
neutron::server::l3_ha: {get_input: neutron_l3_ha}
|
||||||
neutron::plugins::ml2::network_vlan_ranges: {get_input: neutron_network_vlan_ranges}
|
neutron::plugins::ml2::network_vlan_ranges: {get_input: neutron_network_vlan_ranges}
|
||||||
neutron_bridge_mappings: {get_input: neutron_bridge_mappings}
|
neutron_bridge_mappings: {get_input: neutron_bridge_mappings}
|
||||||
neutron_public_interface: {get_input: neutron_public_interface}
|
neutron_public_interface: {get_input: neutron_public_interface}
|
||||||
|
|
Loading…
Reference in New Issue