From: Giulio Fidente <gfidente@redhat.com>
Date: Tue, 2 Jun 2015 02:51:08 +0000 (+0200)
Subject: Wire Neutron allow_automatic_l3agent_failover param to module
X-Git-Tag: opnfv-6.0.0~2519^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=abfc3c5c4c4f12998fe4b64ff5eb9528dbbd898c;p=apex-tripleo-heat-templates.git

Wire Neutron allow_automatic_l3agent_failover param to module

Change-Id: Ibd1581ebb87ed02f3840000e90025a2a371019aa
---

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}