Fix l3_ha enablement

The L3 HA feature needs to be enabled using "l3_ha=True" instead of "ha_enabled=true". Change-Id: I415001419474dd8d242fe238bbf88b5c45c9f3e9 (cherry picked from commit 05eb42aae94253dfd5ffc37dfc665ac3e2631ccd)
xbezdick · Dec 10, 2014 · c3dc520 · c3dc520
1 parent 67abde8
commit c3dc520
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -232,7 +232,7 @@
   if $l3_ha {
     if $min_l3_agents_per_router <= $max_l3_agents_per_router or $max_l3_agents_per_router == '0' {
       neutron_config {
-        'DEFAULT/ha_enabled':               value => true;
+        'DEFAULT/l3_ha':                    value => true;
         'DEFAULT/max_l3_agents_per_router': value => $max_l3_agents_per_router;
         'DEFAULT/min_l3_agents_per_router': value => $min_l3_agents_per_router;
         'DEFAULT/l3_ha_net_cidr':           value => $l3_ha_net_cidr;

diff --git a/spec/classes/neutron_server_spec.rb b/spec/classes/neutron_server_spec.rb
@@ -121,7 +121,7 @@
         params.merge!(:l3_ha => true)
       end
       it 'should enable HA routers' do
-        should contain_neutron_config('DEFAULT/ha_enabled').with_value(true)
+        should contain_neutron_config('DEFAULT/l3_ha').with_value(true)
         should contain_neutron_config('DEFAULT/max_l3_agents_per_router').with_value('3')
         should contain_neutron_config('DEFAULT/min_l3_agents_per_router').with_value('2')
         should contain_neutron_config('DEFAULT/l3_ha_net_cidr').with_value('169.254.192.0/18')