openstack
/
puppet-nova
Code Issues Proposed changes

Use Puppet boolean for better consistency 

This fixes puppet-lint warning "quoted boolean value".

Change-Id: I043f00e1aefd4a9368232c0a93ee3ad4f4aba634
This commit is contained in:
Mathieu Gagné 2013-06-30 19:20:16 -04:00
parent 4a15c47a8a
commit 7336c1dc7c
17 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -46,7 +46,7 @@ class { 'nova':
rabbit_password => 'an_even_bigger_secret',
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => 'localhost:9292',
verbose => 'False'
verbose => false,
rabbit_host => '127.0.0.1',
}

2
manifests/compute/quantum.pp
View File

@ -5,6 +5,6 @@ class nova::compute::quantum (
nova_config {
'DEFAULT/libvirt_vif_driver': value => $libvirt_vif_driver;
'DEFAULT/libvirt_use_virtio_for_bridges': value => 'True';
'DEFAULT/libvirt_use_virtio_for_bridges': value => true;
}
}

4
manifests/init.pp
View File

@ -176,9 +176,9 @@ class nova(
}
if size($rabbit_hosts) > 1 {
nova_config { 'DEFAULT/rabbit_ha_queues': value => 'true' }
nova_config { 'DEFAULT/rabbit_ha_queues': value => true }
} else {
nova_config { 'DEFAULT/rabbit_ha_queues': value => 'false' }
nova_config { 'DEFAULT/rabbit_ha_queues': value => false }
}
if $rabbit_hosts {

6
spec/classes/nova_api_spec.rb
View File

@ -17,7 +17,7 @@ describe 'nova::api' do
it { should contain_service('nova-api').with(
'name' => 'nova-api',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-api').with(
@ -32,7 +32,7 @@ describe 'nova::api' do
it { should contain_service('nova-api').with(
'name' => 'nova-api',
'ensure' => 'running',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => true
)}
end
@ -114,7 +114,7 @@ describe 'nova::api' do
it { should contain_nova_config('DEFAULT/metadata_listen').with('value' => '127.0.0.1') }
it { should contain_nova_config('DEFAULT/osapi_volume_listen').with('value' => '192.168.56.210') }
it { should contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '5') }
it { should contain_nova_config('DEFAULT/service_quantum_metadata_proxy').with('value' => 'true') }
it { should contain_nova_config('DEFAULT/service_quantum_metadata_proxy').with('value' => true) }
it { should contain_nova_config('DEFAULT/quantum_metadata_proxy_shared_secret').with('value' => 'secrete') }
end

6
spec/classes/nova_cert_spec.rb
View File

@ -13,7 +13,7 @@ describe 'nova::cert' do
it { should contain_service('nova-cert').with(
'name' => 'nova-cert',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-cert').with(
@ -28,7 +28,7 @@ describe 'nova::cert' do
it { should contain_service('nova-cert').with(
'name' => 'nova-cert',
'ensure' => 'running',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => true
)}
end
@ -48,7 +48,7 @@ describe 'nova::cert' do
it { should contain_service('nova-cert').with(
'name' => 'openstack-nova-cert',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-cert').with_name('openstack-nova-cert') }

2
spec/classes/nova_compute_quantum_spec.rb
View File

@ -1,7 +1,7 @@
require 'spec_helper'
describe 'nova::compute::quantum' do
it { should contain_nova_config('DEFAULT/libvirt_use_virtio_for_bridges').with_value('True')}
it { should contain_nova_config('DEFAULT/libvirt_use_virtio_for_bridges').with_value(true)}
it { should contain_nova_config('DEFAULT/libvirt_vif_driver').with_value('nova.virt.libvirt.vif.LibvirtOpenVswitchDriver')}
context 'when overriding params' do

14
spec/classes/nova_compute_spec.rb
View File

@ -19,7 +19,7 @@ describe 'nova::compute' do
{ :osfamily => 'Debian' }
end
it { should contain_nova_config('DEFAULT/vnc_enabled').with_value('true') }
it { should contain_nova_config('DEFAULT/vnc_enabled').with_value(true) }
it { should contain_nova_config('DEFAULT/vncserver_proxyclient_address').with_value('127.0.0.1') }
it { should contain_nova_config('DEFAULT/novncproxy_base_url').with_value(
'http://127.0.0.1:6080/vnc_auto.html'
@ -28,7 +28,7 @@ describe 'nova::compute' do
it { should contain_service('nova-compute').with(
'name' => 'nova-compute',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-compute').with(
@ -38,20 +38,20 @@ describe 'nova::compute' do
) }
it { should contain_package('bridge-utils').with(
:ensure => 'present',
:before => 'Nova::Generic_service[compute]'
:before => 'Nova::Generic_service[compute]'
) }
describe 'with enabled as true' do
let :params do
{
:enabled => true,
:enabled => true,
:vncproxy_host => '127.0.0.1'
}
end
it { should contain_service('nova-compute').with(
'name' => 'nova-compute',
'ensure' => 'running',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => true
)}
end
@ -61,7 +61,7 @@ describe 'nova::compute' do
{:vnc_enabled => false}
end
it { should contain_nova_config('DEFAULT/vnc_enabled').with_value('false') }
it { should contain_nova_config('DEFAULT/vnc_enabled').with_value(false) }
it { should contain_nova_config('DEFAULT/vncserver_proxyclient_address').with_value('127.0.0.1')}
it { should_not contain_nova_config('DEFAULT/novncproxy_base_url') }
@ -82,7 +82,7 @@ describe 'nova::compute' do
it { should contain_service('nova-compute').with(
'name' => 'openstack-nova-compute',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-compute').with_name('openstack-nova-compute') }

18
spec/classes/nova_init_spec.rb
View File

@ -23,14 +23,14 @@ describe 'nova' do
it { should contain_group('nova').with(
'ensure' => 'present',
'system' => 'true',
'system' => true,
'require' => 'Package[nova-common]'
)}
it { should contain_user('nova').with(
'ensure' => 'present',
'gid' => 'nova',
'system' => 'true',
'system' => true,
'require' => 'Package[nova-common]'
) }
@ -60,14 +60,14 @@ describe 'nova' do
it { should contain_nova_config('DEFAULT/glance_api_servers').with_value('localhost:9292') }
it { should contain_nova_config('DEFAULT/auth_strategy').with_value('keystone') }
it { should_not contain_nova_config('DEFAULT/use_deprecated_auth').with_value('false') }
it { should_not contain_nova_config('DEFAULT/use_deprecated_auth').with_value(false) }
it { should contain_nova_config('DEFAULT/rpc_backend').with_value('nova.openstack.common.rpc.impl_kombu') }
it { should contain_nova_config('DEFAULT/rabbit_host').with_value('localhost') }
it { should contain_nova_config('DEFAULT/rabbit_password').with_value('guest').with_secret(true) }
it { should contain_nova_config('DEFAULT/rabbit_port').with_value('5672') }
it { should contain_nova_config('DEFAULT/rabbit_hosts').with_value('localhost:5672') }
it { should contain_nova_config('DEFAULT/rabbit_ha_queues').with_value('false') }
it { should contain_nova_config('DEFAULT/rabbit_ha_queues').with_value(false) }
it { should contain_nova_config('DEFAULT/rabbit_userid').with_value('guest') }
it { should contain_nova_config('DEFAULT/rabbit_virtual_host').with_value('/') }
@ -99,7 +99,7 @@ describe 'nova' do
'service_down_time' => '120',
'auth_strategy' => 'foo',
'ensure_package' => '2012.1.1-15.el6',
'monitoring_notifications' => 'true'
'monitoring_notifications' => true
}
end
@ -119,7 +119,7 @@ describe 'nova' do
it { should contain_nova_config('DEFAULT/rabbit_userid').with_value('rabbit_user') }
it { should contain_nova_config('DEFAULT/rabbit_virtual_host').with_value('/') }
it { should contain_nova_config('DEFAULT/rabbit_hosts').with_value('rabbit:5673') }
it { should contain_nova_config('DEFAULT/rabbit_ha_queues').with_value('false') }
it { should contain_nova_config('DEFAULT/rabbit_ha_queues').with_value(false) }
it { should contain_nova_config('DEFAULT/verbose').with_value(true) }
it { should contain_nova_config('DEFAULT/debug').with_value(true) }
@ -142,7 +142,7 @@ describe 'nova' do
it { should_not contain_nova_config('DEFAULT/rabbit_host') }
it { should_not contain_nova_config('DEFAULT/rabbit_port') }
it { should contain_nova_config('DEFAULT/rabbit_hosts').with_value('rabbit:5673,rabbit2:5674') }
it { should contain_nova_config('DEFAULT/rabbit_ha_queues').with_value('true') }
it { should contain_nova_config('DEFAULT/rabbit_ha_queues').with_value(true) }
end
@ -179,7 +179,7 @@ describe 'nova' do
it { should contain_nova_config('DEFAULT/qpid_port').with_value('5672') }
it { should contain_nova_config('DEFAULT/qpid_username').with_value('guest') }
it { should contain_nova_config('DEFAULT/qpid_password').with_value('guest').with_secret(true) }
it { should contain_nova_config('DEFAULT/qpid_reconnect').with_value('true') }
it { should contain_nova_config('DEFAULT/qpid_reconnect').with_value(true) }
it { should contain_nova_config('DEFAULT/qpid_reconnect_timeout').with_value('0') }
it { should contain_nova_config('DEFAULT/qpid_reconnect_limit').with_value('0') }
it { should contain_nova_config('DEFAULT/qpid_reconnect_interval_min').with_value('0') }
@ -187,7 +187,7 @@ describe 'nova' do
it { should contain_nova_config('DEFAULT/qpid_reconnect_interval').with_value('0') }
it { should contain_nova_config('DEFAULT/qpid_heartbeat').with_value('60') }
it { should contain_nova_config('DEFAULT/qpid_protocol').with_value('tcp') }
it { should contain_nova_config('DEFAULT/qpid_tcp_nodelay').with_value('true') }
it { should contain_nova_config('DEFAULT/qpid_tcp_nodelay').with_value(true) }
it { should contain_nova_config('DEFAULT/verbose').with_value(true) }
it { should contain_nova_config('DEFAULT/debug').with_value(true) }

8
spec/classes/nova_network_flatdhcp_spec.rb
View File

@ -16,8 +16,8 @@ describe 'nova::network::flatdhcp' do
it { should contain_nova_config('DEFAULT/flat_interface').with_value('eth1') }
it { should contain_nova_config('DEFAULT/flat_interface').with_value('eth1') }
it { should contain_nova_config('DEFAULT/flat_network_bridge').with_value('br100') }
it { should contain_nova_config('DEFAULT/force_dhcp_release').with_value('true') }
it { should contain_nova_config('DEFAULT/flat_injected').with_value('false') }
it { should contain_nova_config('DEFAULT/force_dhcp_release').with_value(true) }
it { should contain_nova_config('DEFAULT/flat_injected').with_value(false) }
it { should contain_nova_config('DEFAULT/dhcpbridge').with_value('/usr/bin/nova-dhcpbridge') }
it { should contain_nova_config('DEFAULT/dhcpbridge_flagfile').with_value('/etc/nova/nova.conf') }
end
@ -39,8 +39,8 @@ describe 'nova::network::flatdhcp' do
it { should contain_nova_config('DEFAULT/public_interface').with_value('eth0') }
it { should contain_nova_config('DEFAULT/flat_network_bridge').with_value('br1001') }
it { should contain_nova_config('DEFAULT/force_dhcp_release').with_value('false') }
it { should contain_nova_config('DEFAULT/flat_injected').with_value('true') }
it { should contain_nova_config('DEFAULT/force_dhcp_release').with_value(false) }
it { should contain_nova_config('DEFAULT/flat_injected').with_value(true) }
it { should contain_nova_config('DEFAULT/dhcpbridge').with_value('/usr/bin/dhcpbridge') }
it { should contain_nova_config('DEFAULT/dhcpbridge_flagfile').with_value('/etc/nova/nova-dhcp.conf') }

6
spec/classes/nova_network_spec.rb
View File

@ -40,7 +40,7 @@ describe 'nova::network' do
it { should contain_service('nova-network').with(
'name' => 'nova-network',
'ensure' => 'running',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => true
)}
end
@ -48,7 +48,7 @@ describe 'nova::network' do
it { should contain_service('nova-network').with(
'name' => 'nova-network',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
end
@ -207,7 +207,7 @@ describe 'nova::network' do
it { should contain_service('nova-network').with(
'name' => 'openstack-nova-network',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-network').with_name('openstack-nova-network') }

4
spec/classes/nova_network_vlan_spec.rb
View File

@ -15,7 +15,7 @@ describe 'nova::network::vlan' do
it { should contain_nova_config('DEFAULT/fixed_range').with_value('10.0.0.0/32') }
it { should contain_nova_config('DEFAULT/vlan_start').with_value('300') }
it { should contain_nova_config('DEFAULT/vlan_interface').with_value('eth1') }
it { should contain_nova_config('DEFAULT/force_dhcp_release').with_value('true') }
it { should contain_nova_config('DEFAULT/force_dhcp_release').with_value(true) }
it { should contain_nova_config('DEFAULT/dhcpbridge').with_value('/usr/bin/nova-dhcpbridge') }
it { should contain_nova_config('DEFAULT/dhcpbridge_flagfile').with_value('/etc/nova/nova.conf') }
@ -40,7 +40,7 @@ describe 'nova::network::vlan' do
it { should contain_nova_config('DEFAULT/fixed_range').with_value('10.0.0.0/32') }
it { should contain_nova_config('DEFAULT/vlan_start').with_value('100') }
it { should contain_nova_config('DEFAULT/vlan_interface').with_value('eth1') }
it { should contain_nova_config('DEFAULT/force_dhcp_release').with_value('false') }
it { should contain_nova_config('DEFAULT/force_dhcp_release').with_value(false) }
it { should contain_nova_config('DEFAULT/dhcpbridge').with_value('/usr/bin/dhcpbridge') }
it { should contain_nova_config('DEFAULT/dhcpbridge_flagfile').with_value('/etc/nova/nova-dhcp.conf') }
end

6
spec/classes/nova_objectstore_spec.rb
View File

@ -13,7 +13,7 @@ describe 'nova::objectstore' do
it { should contain_service('nova-objectstore').with(
'name' => 'nova-objectstore',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-objectstore').with(
@ -28,7 +28,7 @@ describe 'nova::objectstore' do
it { should contain_service('nova-objectstore').with(
'name' => 'nova-objectstore',
'ensure' => 'running',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => true
)}
end
@ -48,7 +48,7 @@ describe 'nova::objectstore' do
it { should contain_service('nova-objectstore').with(
'name' => 'openstack-nova-objectstore',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-objectstore').with_name('openstack-nova-objectstore') }

6
spec/classes/nova_scheduler_spec.rb
View File

@ -13,7 +13,7 @@ describe 'nova::scheduler' do
it { should contain_service('nova-scheduler').with(
'name' => 'nova-scheduler',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-scheduler').with(
@ -28,7 +28,7 @@ describe 'nova::scheduler' do
it { should contain_service('nova-scheduler').with(
'name' => 'nova-scheduler',
'ensure' => 'running',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => true
)}
end
@ -48,7 +48,7 @@ describe 'nova::scheduler' do
it { should contain_service('nova-scheduler').with(
'name' => 'openstack-nova-scheduler',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-scheduler').with_name('openstack-nova-scheduler') }

4
spec/classes/nova_vnc_proxy_spec.rb
View File

@ -29,7 +29,7 @@ describe 'nova::vncproxy' do
) }
it { should contain_service('nova-vncproxy').with(
:name => 'nova-novncproxy',
:hasstatus => 'true',
:hasstatus => true,
:ensure => 'running'
)}
@ -54,7 +54,7 @@ describe 'nova::vncproxy' do
)}
it { should contain_service('nova-vncproxy').with(
:name => 'novnc',
:hasstatus => 'true',
:hasstatus => true,
:ensure => 'running'
)}
end

6
spec/classes/nova_volume_spec.rb
View File

@ -13,7 +13,7 @@ describe 'nova::volume' do
it { should contain_service('nova-volume').with(
'name' => 'nova-volume',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-volume').with(
@ -28,7 +28,7 @@ describe 'nova::volume' do
it { should contain_service('nova-volume').with(
'name' => 'nova-volume',
'ensure' => 'running',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => true
)}
end
@ -48,7 +48,7 @@ describe 'nova::volume' do
it { should contain_service('nova-volume').with(
'name' => 'openstack-nova-volume',
'ensure' => 'stopped',
'hasstatus' => 'true',
'hasstatus' => true,
'enable' => false
)}
it { should contain_package('nova-volume').with_name('openstack-nova-volume') }

8
tests/all.pp
View File

@ -80,8 +80,8 @@ class { 'glance::db::mysql':
}
class { 'glance::api':
verbose => 'True',
debug => 'True',
verbose => true,
debug => true,
auth_type => 'keystone',
auth_host => '127.0.0.1',
auth_port => '35357',
@ -92,8 +92,8 @@ class { 'glance::api':
class { 'glance::backend::file': }
class { 'glance::registry':
verbose => 'True',
debug => 'True',
verbose => true,
debug => true,
auth_type => 'keystone',
auth_host => '127.0.0.1',
auth_port => '35357',

8
tests/multi.pp
View File

@ -100,8 +100,8 @@ node /controller/ {
}
class { 'glance::api':
verbose => 'True',
debug => 'True',
verbose => true,
debug => true,
auth_type => 'keystone',
auth_host => '127.0.0.1',
auth_port => '35357',
@ -112,8 +112,8 @@ node /controller/ {
class { 'glance::backend::file': }
class { 'glance::registry':
verbose => 'True',
debug => 'True',
verbose => true,
debug => true,
auth_type => 'keystone',
auth_host => '127.0.0.1',
auth_port => '35357',