diff --git a/examples/all.pp b/examples/all.pp index 0e2e7036f..58d84dbc0 100644 --- a/examples/all.pp +++ b/examples/all.pp @@ -71,8 +71,8 @@ class { 'keystone::config::mysql': class { 'keystone': admin_token => $keystone_admin_token, bind_host => '127.0.0.1', - log_verbose => true, - log_debug => true, + verbose => true, + debug => true, catalog_type => 'sql', } # set up keystone admin users @@ -97,8 +97,8 @@ class { 'glance::db::mysql': } class { 'glance::api': - log_verbose => 'True', - log_debug => 'True', + verbose => 'True', + debug => 'True', auth_type => 'keystone', auth_host => '127.0.0.1', auth_port => '35357', @@ -109,8 +109,8 @@ class { 'glance::api': class { 'glance::backend::file': } class { 'glance::registry': - log_verbose => 'True', - log_debug => 'True', + verbose => 'True', + debug => 'True', auth_type => 'keystone', auth_host => '127.0.0.1', auth_port => '35357', diff --git a/examples/multi.pp b/examples/multi.pp index 3577639a8..663e0f852 100644 --- a/examples/multi.pp +++ b/examples/multi.pp @@ -91,8 +91,8 @@ node /controller/ { class { 'keystone': admin_token => $keystone_admin_token, bind_host => '127.0.0.1', - log_verbose => true, - log_debug => true, + verbose => true, + debug => true, catalog_type => 'sql', } # set up keystone admin users @@ -117,8 +117,8 @@ node /controller/ { } class { 'glance::api': - log_verbose => 'True', - log_debug => 'True', + verbose => 'True', + debug => 'True', auth_type => 'keystone', auth_host => '127.0.0.1', auth_port => '35357', @@ -129,8 +129,8 @@ node /controller/ { class { 'glance::backend::file': } class { 'glance::registry': - log_verbose => 'True', - log_debug => 'True', + verbose => 'True', + debug => 'True', auth_type => 'keystone', auth_host => '127.0.0.1', auth_port => '35357', diff --git a/examples/site.pp b/examples/site.pp index a6d5ce7aa..018493458 100644 --- a/examples/site.pp +++ b/examples/site.pp @@ -164,8 +164,8 @@ node all { password => 'keystone' } class { 'keystone': - log_verbose => true, - log_debug => true, + verbose => true, + debug => true, catalog_type => 'sql', }-> class { 'keystone::mysql': diff --git a/tests/ubuntu/cc.pp b/tests/ubuntu/cc.pp index 2529b100b..e98b8d854 100644 --- a/tests/ubuntu/cc.pp +++ b/tests/ubuntu/cc.pp @@ -27,8 +27,8 @@ class { 'nova::ubuntu::cc': } class { "glance::api": - log_verbose => 'true', - log_debug => 'true', + verbose => 'true', + debug => 'true', } class { "glance::registry": log_verbose => 'true',