diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2015-03-13 07:33:21 -0400 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2015-03-19 15:23:00 +0000 |
| commit | fed9d001ccc92a6d3392cb959416596b6df83d99 (patch) | |
| tree | e6b1652e62ebe6b431bc4e353961108351701117 /puppet/compute-puppet.yaml | |
| parent | 3eb3134c2657ccbbb005746104327f53632f740e (diff) | |
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
Diffstat (limited to 'puppet/compute-puppet.yaml')
| -rw-r--r-- | puppet/compute-puppet.yaml | 7 |
1 files changed, 3 insertions, 4 deletions
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: |