diff --git a/examples/single.pp b/examples/single.pp index 658c1f8a..5eecfe93 100644 --- a/examples/single.pp +++ b/examples/single.pp @@ -12,8 +12,8 @@ node glance { node glance_keystone { class { 'keystone::config::sqlite': } class { 'keystone': - log_verbose => true, - log_debug => true, + verbose => true, + debug => true, catalog_type => 'sql', } class { 'keystone::roles::admin': } @@ -24,8 +24,8 @@ node glance_keystone { node glance_keystone_mysql { class { 'mysql::server': } class { 'keystone': - log_verbose => true, - log_debug => true, + verbose => true, + debug => true, catalog_type => 'sql', } class { 'keystone::db::mysql': @@ -46,8 +46,8 @@ node default { class role_glance_sqlite { class { 'glance::api': - log_verbose => 'True', - log_debug => 'True', + verbose => 'True', + debug => 'True', auth_type => 'keystone', keystone_tenant => 'services', keystone_user => 'glance', @@ -56,8 +56,8 @@ class role_glance_sqlite { class { 'glance::backend::file': } class { 'glance::registry': - log_verbose => 'True', - log_debug => 'True', + verbose => 'True', + debug => 'True', auth_type => 'keystone', keystone_tenant => 'services', keystone_user => 'glance', @@ -69,8 +69,8 @@ class role_glance_sqlite { class role_glance_mysql { class { 'glance::api': - log_verbose => 'True', - log_debug => 'True', + verbose => 'True', + debug => 'True', auth_type => 'keystone', keystone_tenant => 'services', keystone_user => 'glance', @@ -88,8 +88,8 @@ class role_glance_mysql { } class { 'glance::registry': - log_verbose => 'True', - log_debug => 'True', + verbose => 'True', + debug => 'True', auth_type => 'keystone', keystone_tenant => 'services', keystone_user => 'glance', diff --git a/manifests/api.pp b/manifests/api.pp index 7fd412e9..a672155d 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -2,10 +2,10 @@ # # == Paremeters: # -# $log_verbose - rather to log the glance api service at verbose level. +# $verbose - rather to log the glance api service at verbose level. # Optional. Default: false # -# $log_debug - rather to log the glance api service at debug level. +# $debug - rather to log the glance api service at debug level. # Optional. Default: false # # $default_store - Backend used to store glance dist images. @@ -28,8 +28,8 @@ # # class glance::api( - $log_verbose = 'False', - $log_debug = 'False', + $verbose = 'False', + $debug = 'False', $bind_host = '0.0.0.0', $bind_port = '9292', $backlog = '4096', @@ -87,8 +87,8 @@ class glance::api( # basic service config glance_api_config { - 'DEFAULT/verbose': value => $log_verbose; - 'DEFAULT/debug': value => $log_debug; + 'DEFAULT/verbose': value => $verbose; + 'DEFAULT/debug': value => $debug; 'DEFAULT/bind_host': value => $bind_host; 'DEFAULT/bind_port': value => $bind_port; 'DEFAULT/backlog': value => $backlog; @@ -97,8 +97,8 @@ class glance::api( } glance_cache_config { - 'DEFAULT/verbose': value => $log_verbose; - 'DEFAULT/debug': value => $log_debug; + 'DEFAULT/verbose': value => $verbose; + 'DEFAULT/debug': value => $debug; } # configure api service to connect registry service diff --git a/manifests/registry.pp b/manifests/registry.pp index 3b484045..64ab672c 100644 --- a/manifests/registry.pp +++ b/manifests/registry.pp @@ -1,6 +1,6 @@ class glance::registry( - $log_verbose = 'False', - $log_debug = 'False', + $verbose = 'False', + $debug = 'False', $bind_host = '0.0.0.0', $bind_port = '9191', $log_file = '/var/log/glance/registry.log', @@ -47,8 +47,8 @@ class glance::registry( # basic service config glance_registry_config { - 'DEFAULT/verbose': value => $log_verbose; - 'DEFAULT/debug': value => $log_debug; + 'DEFAULT/verbose': value => $verbose; + 'DEFAULT/debug': value => $debug; 'DEFAULT/bind_host': value => $bind_host; 'DEFAULT/bind_port': value => $bind_port; } diff --git a/spec/classes/glance_registry_spec.rb b/spec/classes/glance_registry_spec.rb index d710c196..8a6b8715 100644 --- a/spec/classes/glance_registry_spec.rb +++ b/spec/classes/glance_registry_spec.rb @@ -10,8 +10,8 @@ describe 'glance::registry' do let :default_params do { - :log_verbose => 'False', - :log_debug => 'False', + :verbose => 'False', + :debug => 'False', :bind_host => '0.0.0.0', :bind_port => '9191', :log_file => '/var/log/glance/registry.log', diff --git a/tests/api.pp b/tests/api.pp index ff20367e..1664b191 100644 --- a/tests/api.pp +++ b/tests/api.pp @@ -1,4 +1,4 @@ class { 'glance::api': - log_debug => 'true', - log_verbose => 'true', + debug => 'true', + verbose => 'true', } diff --git a/tests/registry.pp b/tests/registry.pp index 49c6b4a8..11fe4e44 100644 --- a/tests/registry.pp +++ b/tests/registry.pp @@ -1,4 +1,4 @@ class { 'glance::registry': - log_debug =>'true', - log_verbose => 'true', + debug =>'true', + verbose => 'true', }