diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-04 10:38:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-04 10:38:24 +0000 |
| commit | a68fd13608f2dae77923a8411217a72beed6ef12 (patch) | |
| tree | 9b3f8cf899e0d695498ec159149c24f67ec31b07 | |
| parent | 4fe67fdc38f66f2ee03423b8154dbb19baced46a (diff) | |
| parent | abfc3c5c4c4f12998fe4b64ff5eb9528dbbd898c (diff) | |
Merge "Wire Neutron allow_automatic_l3agent_failover param to module"
| -rw-r--r-- | puppet/controller-puppet.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 47c1c018..c874108a 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -244,7 +244,7 @@ parameters: default: 'dvr_snat' description: Agent mode for the neutron-l3-agent on the controller hosts type: string - NeutronL3HA: #FIXME this isn't wired in + NeutronL3HA: default: 'False' description: Whether to enable l3-agent HA type: string @@ -863,7 +863,7 @@ resources: neutron_agent_mode: {get_input: neutron_agent_mode} 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::allow_automatic_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} |