From 21864b8f2cbecec7701f85f205a2bc9279e36acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Mon, 1 Jul 2013 22:35:58 -0400 Subject: [PATCH] Use Puppet boolean for better consistency Change-Id: Ibb8eb6ff11f235e7ddc93c97575fa7af6ed67f5b --- manifests/controller.pp | 2 +- manifests/glance.pp | 10 +++---- manifests/keystone.pp | 8 ++--- manifests/nova/controller.pp | 4 +-- manifests/provision.pp | 10 +++---- spec/classes/openstack_auth_file_spec.rb | 2 +- spec/classes/openstack_controller_spec.rb | 36 +++++++++++------------ spec/classes/openstack_glance_spec.rb | 10 +++---- spec/classes/openstack_keystone_spec.rb | 4 +-- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/manifests/controller.pp b/manifests/controller.pp index 851aa7d..7f59925 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -168,7 +168,7 @@ class openstack::controller ( $vnc_enabled = true, $vncproxy_host = false, # General - $verbose = 'False', + $verbose = false, # cinder # if the cinder management components should be installed $cinder = true, diff --git a/manifests/glance.pp b/manifests/glance.pp index 2043de1..4ec0b43 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -22,8 +22,8 @@ # [swift_store_user] The Swift service user account. Defaults to false. # [swift_store_key] The Swift service user password Defaults to false. # [swift_store_auth_addres] The URL where the Swift auth service lives. Defaults to "http://${keystone_host}:5000/v2.0/" -# [verbose] Log verbosely. Optional. Defaults to 'False' -# [debug] Log at a debug-level. Optional. Defaults to 'False' +# [verbose] Log verbosely. Optional. Defaults to false. +# [debug] Log at a debug-level. Optional. Defaults to false. # [enabled] Used to indicate if the service should be active (true) or passive (false). # Optional. Defaults to true # @@ -48,8 +48,8 @@ class openstack::glance ( $swift_store_user = false, $swift_store_key = false, $swift_store_auth_address = 'http://127.0.0.1:5000/v2.0/', - $verbose = 'False', - $debug = 'False', + $verbose = false, + $debug = false, $enabled = true ) { @@ -103,7 +103,7 @@ class openstack::glance ( swift_store_user => $swift_store_user, swift_store_key => $swift_store_key, swift_store_auth_address => $swift_store_auth_address, - swift_store_create_container_on_put => 'True', + swift_store_create_container_on_put => true, } } elsif($backend == 'file') { # Configure file storage backend diff --git a/manifests/keystone.pp b/manifests/keystone.pp index ab8a0bf..5578c7e 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -18,8 +18,8 @@ # [keystone_db_user] Name of keystone db user. Optional. Defaults to 'keystone' # [keystone_db_dbname] Name of keystone DB. Optional. Defaults to 'keystone' # [keystone_admin_tenant] Name of keystone admin tenant. Optional. Defaults to 'admin' -# [verbose] Log verbosely. Optional. Defaults to 'False' -# [debug] Log at a debug-level. Optional. Defaults to 'False' +# [verbose] Log verbosely. Optional. Defaults to false. +# [debug] Log at a debug-level. Optional. Defaults to false. # [bind_host] Address that keystone binds to. Optional. Defaults to '0.0.0.0' # [internal_address] Internal address for keystone. Optional. Defaults to $public_address # [admin_address] Keystone admin address. Optional. Defaults to $internal_address @@ -60,8 +60,8 @@ class openstack::keystone ( $db_user = 'keystone', $db_name = 'keystone', $admin_tenant = 'admin', - $verbose = 'False', - $debug = 'False', + $verbose = false, + $debug = false, $bind_host = '0.0.0.0', $region = 'RegionOne', $internal_address = false, diff --git a/manifests/nova/controller.pp b/manifests/nova/controller.pp index f36d74f..e9e868c 100644 --- a/manifests/nova/controller.pp +++ b/manifests/nova/controller.pp @@ -143,7 +143,7 @@ class openstack::nova::controller ( if $quantum == false { # Configure nova-network if $multi_host { - nova_config { 'DEFAULT/multi_host': value => 'True' } + nova_config { 'DEFAULT/multi_host': value => true } $enable_network_service = false } else { if $enabled { @@ -190,7 +190,7 @@ class openstack::nova::controller ( } if $auto_assign_floating_ip { - nova_config { 'DEFAULT/auto_assign_floating_ip': value => 'True' } + nova_config { 'DEFAULT/auto_assign_floating_ip': value => true } } # a bunch of nova services that require no configuration diff --git a/manifests/provision.pp b/manifests/provision.pp index ca0f386..c627d54 100644 --- a/manifests/provision.pp +++ b/manifests/provision.pp @@ -75,24 +75,24 @@ class openstack::provision( keystone_tenant { $tenant_name: ensure => present, - enabled => 'True', + enabled => true, description => 'default tenant', } keystone_user { $username: ensure => present, - enabled => 'True', + enabled => true, tenant => $tenant_name, password => $password, } keystone_tenant { $alt_tenant_name: ensure => present, - enabled => 'True', + enabled => true, description => 'alt tenant', } keystone_user { $alt_username: ensure => present, - enabled => 'True', + enabled => true, tenant => $alt_tenant_name, password => $alt_password, } @@ -111,7 +111,7 @@ class openstack::provision( quantum_network { $public_network_name: ensure => present, - router_external => 'True', + router_external => true, tenant_name => $admin_tenant_name, } quantum_subnet { $public_subnet_name: diff --git a/spec/classes/openstack_auth_file_spec.rb b/spec/classes/openstack_auth_file_spec.rb index b0b195b..24869ed 100644 --- a/spec/classes/openstack_auth_file_spec.rb +++ b/spec/classes/openstack_auth_file_spec.rb @@ -33,7 +33,7 @@ describe 'openstack::auth_file' do :keystone_admin_token => 'keystone', :admin_user => 'nova', :admin_tenant => 'nova', - :use_no_cache => 'false', + :use_no_cache => false, } end diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb index 3c1e707..ea6595e 100644 --- a/spec/classes/openstack_controller_spec.rb +++ b/spec/classes/openstack_controller_spec.rb @@ -184,8 +184,8 @@ describe 'openstack::controller' do ) should contain_class('keystone').with( - :verbose => 'False', - :debug => 'False', + :verbose => false, + :debug => false, :catalog_type => 'sql', :enabled => true, :admin_token => 'keystone_admin_token', @@ -265,8 +265,8 @@ describe 'openstack::controller' do it 'should contain enabled glance with defaults' do should contain_class('glance::api').with( - :verbose => 'False', - :debug => 'False', + :verbose => false, + :debug => false, :auth_type => 'keystone', :auth_host => '127.0.0.1', :auth_port => '35357', @@ -278,8 +278,8 @@ describe 'openstack::controller' do ) should contain_class('glance::registry').with( - :verbose => 'False', - :debug => 'False', + :verbose => false, + :debug => false, :auth_type => 'keystone', :auth_host => '127.0.0.1', :auth_port => '35357', @@ -313,7 +313,7 @@ describe 'openstack::controller' do let :params do default_params.merge( - :verbose => 'False', + :verbose => false, :glance_user_password => 'glance_pass2', :glance_db_password => 'glance_pass3', :db_host => '127.0.0.2', @@ -325,8 +325,8 @@ describe 'openstack::controller' do it 'should override params for glance' do should contain_class('glance::api').with( - :verbose => 'False', - :debug => 'False', + :verbose => false, + :debug => false, :auth_type => 'keystone', :auth_host => '127.0.0.1', :auth_port => '35357', @@ -337,8 +337,8 @@ describe 'openstack::controller' do ) should contain_class('glance::registry').with( - :verbose => 'False', - :debug => 'False', + :verbose => false, + :debug => false, :auth_type => 'keystone', :auth_host => '127.0.0.1', :auth_port => '35357', @@ -382,7 +382,7 @@ describe 'openstack::controller' do :rabbit_virtual_host => '/', :image_service => 'nova.image.glance.GlanceImageService', :glance_api_servers => '10.0.0.1:9292', - :verbose => 'False' + :verbose => false ) should contain_class('nova::api').with( :enabled => true, @@ -405,9 +405,9 @@ describe 'openstack::controller' do end context 'when auto assign floating ip is assigned' do let :params do - default_params.merge(:auto_assign_floating_ip => 'true') + default_params.merge(:auto_assign_floating_ip => true) end - it { should contain_nova_config('DEFAULT/auto_assign_floating_ip').with(:value => 'True')} + it { should contain_nova_config('DEFAULT/auto_assign_floating_ip').with(:value => true)} end context 'when not enabled' do let :params do @@ -465,7 +465,7 @@ describe 'openstack::controller' do end it 'should configure cinder using defaults' do should contain_class('cinder').with( - :verbose => 'False', + :verbose => false, :sql_connection => 'mysql://cinder:cinder_pass@127.0.0.1/cinder?charset=utf8', :rabbit_password => 'rabbit_pw' ) @@ -477,7 +477,7 @@ describe 'openstack::controller' do context 'when overriding config' do let :params do default_params.merge( - :verbose => 'True', + :verbose => true, :rabbit_user => 'rabbituser', :rabbit_password => 'rabbit_pw2', :cinder_user_password => 'foo', @@ -489,7 +489,7 @@ describe 'openstack::controller' do end it 'should configure cinder using defaults' do should contain_class('cinder').with( - :verbose => 'True', + :verbose => true, :sql_connection => 'mysql://baz:bar@127.0.0.2/blah?charset=utf8', :rabbit_password => 'rabbit_pw2', :rabbit_userid => 'rabbituser' @@ -576,7 +576,7 @@ describe 'openstack::controller' do let :params do default_params.merge(:quantum => false, :multi_host => true) end - it { should contain_nova_config('DEFAULT/multi_host').with(:value => 'True')} + it { should contain_nova_config('DEFAULT/multi_host').with(:value => true)} it {should contain_class('nova::network').with( :create_networks => true, :enabled => false, diff --git a/spec/classes/openstack_glance_spec.rb b/spec/classes/openstack_glance_spec.rb index e48cd38..e01c453 100644 --- a/spec/classes/openstack_glance_spec.rb +++ b/spec/classes/openstack_glance_spec.rb @@ -20,8 +20,8 @@ describe 'openstack::glance' do describe 'with only required parameters' do it 'should configure with applicable defaults' do should contain_class('glance::api').with( - :verbose => 'False', - :debug => 'False', + :verbose => false, + :debug => false, :auth_type => 'keystone', :auth_port => '35357', :auth_host => '127.0.1.1', @@ -33,8 +33,8 @@ describe 'openstack::glance' do :enabled => true ) should contain_class('glance::registry').with( - :verbose => 'False', - :debug => 'False', + :verbose => false, + :debug => false, :auth_host => '127.0.1.1', :auth_port => '35357', :auth_type => 'keystone', @@ -83,7 +83,7 @@ describe 'openstack::glance' do :swift_store_user => 'dan', :swift_store_key => '123', :swift_store_auth_address => 'http://127.0.0.1:5000/v2.0/', - :swift_store_create_container_on_put => 'True' + :swift_store_create_container_on_put => true ) end diff --git a/spec/classes/openstack_keystone_spec.rb b/spec/classes/openstack_keystone_spec.rb index 4911a13..064ca29 100644 --- a/spec/classes/openstack_keystone_spec.rb +++ b/spec/classes/openstack_keystone_spec.rb @@ -31,8 +31,8 @@ describe 'openstack::keystone' do it 'should configure keystone and all default endpoints' do should contain_class('keystone').with( - :verbose => 'False', - :debug => 'False', + :verbose => false, + :debug => false, :bind_host => '0.0.0.0', :idle_timeout => '200', :catalog_type => 'sql',