diff options
| -rw-r--r-- | compute.yaml | 2 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 1 | ||||
| -rw-r--r-- | puppet/compute-puppet.yaml | 7 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 6 |
4 files changed, 12 insertions, 4 deletions
diff --git a/compute.yaml b/compute.yaml index c776d9dd..46938ec2 100644 --- a/compute.yaml +++ b/compute.yaml @@ -168,10 +168,12 @@ parameters: The mechanism drivers for the Neutron tenant network. To specify multiple values, use a comma separated string, like so: 'openvswitch,l2_population' type: string + # Not relevant for Computes, should be removed NeutronAllowL3AgentFailover: default: 'True' description: Allow automatic l3-agent failover type: string + # Not relevant for Computes, should be removed NeutronL3HA: default: 'False' description: Whether to enable l3-agent HA diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index e3e3e936..3bc969e2 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -625,6 +625,7 @@ resources: NeutronAgentMode: {get_param: NeutronComputeAgentMode} NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice} NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers} + # L3 HA and Failover is not relevant for Computes, should be removed NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover} NeutronL3HA: {get_param: NeutronL3HA} NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index c98d1b0e..bc0e4b24 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -168,11 +168,13 @@ parameters: The mechanism drivers for the Neutron tenant network. To specify multiple values, use a comma separated string, like so: 'openvswitch,l2_population' type: string + # Not relevant for Computes, should be removed NeutronAllowL3AgentFailover: default: 'True' description: Allow automatic l3-agent failover type: string - NeutronL3HA: #FIXME this isn't wired in + # Not relevant for Computes, should be removed + NeutronL3HA: default: 'False' description: Whether to enable l3-agent HA type: string @@ -319,8 +321,6 @@ resources: neutron_agent_mode: {get_input: neutron_agent_mode} neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret} 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} admin_password: {get_input: admin_password} nova::rabbit_host: {get_input: rabbit_host} @@ -383,7 +383,6 @@ resources: neutron_router_distributed: {get_param: NeutronDVR} neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers} - neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice} neutron_url: list_join: diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 4385bbc1..8b576bfe 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -242,6 +242,10 @@ parameters: type: string default: '' description: If set, flat networks to configure in neutron plugins. + NeutronL3HA: + default: 'False' + description: Whether to enable l3-agent HA + type: string NeutronNetworkType: default: 'gre' description: The tenant network type for Neutron, either gre or vxlan. @@ -516,6 +520,7 @@ resources: neutron_router_distributed: {get_param: NeutronDVR} neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers} neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} + neutron_l3_ha: {get_param: NeutronL3HA} neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges} neutron_bridge_mappings: {get_param: NeutronBridgeMappings} neutron_public_interface: {get_param: NeutronPublicInterface} @@ -714,6 +719,7 @@ resources: neutron_router_distributed: {get_input: neutron_router_distributed} neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers} 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_bridge_mappings: {get_input: neutron_bridge_mappings} neutron_public_interface: {get_input: neutron_public_interface} |