openstack/puppet-neutron
Code Issues Proposed changes

Merge "Fix l3_ha enablement"

Browse Source
This commit is contained in:
Jenkins 2014-12-10 16:09:38 +00:00 committed by Gerrit Code Review
commit 109abb2364
2 changed files with 2 additions and 2 deletions
manifests
server.pp
spec/classes
neutron_server_spec.rb

2
manifests/server.pp

@ -236,7 +236,7 @@ class neutron::server (
if $l3_ha { if $l3_ha {
if $min_l3_agents_per_router <= $max_l3_agents_per_router or $max_l3_agents_per_router == '0' { if $min_l3_agents_per_router <= $max_l3_agents_per_router or $max_l3_agents_per_router == '0' {
neutron_config { 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/max_l3_agents_per_router': value => $max_l3_agents_per_router;
'DEFAULT/min_l3_agents_per_router': value => $min_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; 'DEFAULT/l3_ha_net_cidr': value => $l3_ha_net_cidr;

2
spec/classes/neutron_server_spec.rb

@ -125,7 +125,7 @@ describe 'neutron::server' do
params.merge!(:l3_ha => true) params.merge!(:l3_ha => true)
end end
it 'should enable HA routers' do 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/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/min_l3_agents_per_router').with_value('2')
should contain_neutron_config('DEFAULT/l3_ha_net_cidr').with_value('169.254.192.0/18') should contain_neutron_config('DEFAULT/l3_ha_net_cidr').with_value('169.254.192.0/18')