stackforge/puppet-openstack
Code Issues Proposed changes

Pass puppet booleans to nova_config

Browse Source 
Change-Id: I17d2b12369a4912346078e241ef36b04f4a13271
This commit is contained in:
Soren Hansen
2013-06-12 10:53:56 +02:00
parent 65136eca46
commit 35d5e36efa
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/compute.pp
View File

@@ -143,8 +143,8 @@ class openstack::compute (
if $multi_host { if $multi_host {
include keystone::python include keystone::python
nova_config { nova_config {
'DEFAULT/multi_host': value => 'True'; 'DEFAULT/multi_host': value => true;
'DEFAULT/send_arp_for_ha': value => 'True'; 'DEFAULT/send_arp_for_ha': value => true;
} }
if ! $public_interface { if ! $public_interface {
fail('public_interface must be defined for multi host compute nodes') fail('public_interface must be defined for multi host compute nodes')
@@ -160,8 +160,8 @@ class openstack::compute (
} else { } else {
$enable_network_service = false $enable_network_service = false
nova_config { nova_config {
'DEFAULT/multi_host': value => 'False'; 'DEFAULT/multi_host': value => false;
'DEFAULT/send_arp_for_ha': value => 'False'; 'DEFAULT/send_arp_for_ha': value => false;
} }
} }

14
spec/classes/openstack_compute_spec.rb
View File

@@ -50,8 +50,8 @@ describe 'openstack::compute' do
:libvirt_type => 'kvm', :libvirt_type => 'kvm',
:vncserver_listen => '127.0.0.2' :vncserver_listen => '127.0.0.2'
) )
should contain_nova_config('DEFAULT/multi_host').with( :value => 'False' ) should contain_nova_config('DEFAULT/multi_host').with( :value => false )
should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => 'False' ) should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => false )
should_not contain_class('nova::api') should_not contain_class('nova::api')
should contain_class('nova::network').with({ should contain_class('nova::network').with({
:enabled => false, :enabled => false,
@@ -123,8 +123,8 @@ describe 'openstack::compute' do
:libvirt_type => 'qemu', :libvirt_type => 'qemu',
:vncserver_listen => '127.0.0.1' :vncserver_listen => '127.0.0.1'
) )
should contain_nova_config('DEFAULT/multi_host').with( :value => 'False' ) should contain_nova_config('DEFAULT/multi_host').with( :value => false )
should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => 'False' ) should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => false )
should_not contain_class('nova::api') should_not contain_class('nova::api')
should contain_class('nova::network').with({ should contain_class('nova::network').with({
:enabled => false, :enabled => false,
@@ -161,8 +161,8 @@ describe 'openstack::compute' do
it 'should configure nova for multi-host' do it 'should configure nova for multi-host' do
#should contain_class('keystone::python') #should contain_class('keystone::python')
should contain_nova_config('DEFAULT/multi_host').with(:value => 'True') should contain_nova_config('DEFAULT/multi_host').with(:value => true)
should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => 'True') should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => true)
should contain_class('nova::network').with({ should contain_class('nova::network').with({
'enabled' => true, 'enabled' => true,
'install_service' => true 'install_service' => true
@@ -229,7 +229,7 @@ describe 'openstack::compute' do
end end
it { it {
should contain_nova_config('DEFAULT/multi_host').with({ 'value' => 'True'}) should contain_nova_config('DEFAULT/multi_host').with({ 'value' => true})
should contain_class('nova::api') should contain_class('nova::api')
should contain_class('nova::network').with({ should contain_class('nova::network').with({
'enabled' => true, 'enabled' => true,