summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Bode <dan@puppetlabs.com>2012-10-14 00:20:47 -0700
committerDan Bode <dan@puppetlabs.com>2012-10-14 00:21:14 -0700
commit4cd8cf36a3a29255a57f53a91fb9e0c57777cca8 (patch)
tree308392fff1d4dda4d40e2974a36ec649f91234bc
parentc1a5a1e9195596d473b5c3f2dd3420482abae06d (diff)
switch log_verbose,log_debug to debug,verbose
-rw-r--r--examples/single.pp24
-rw-r--r--manifests/api.pp16
-rw-r--r--manifests/registry.pp8
-rw-r--r--spec/classes/glance_registry_spec.rb4
-rw-r--r--tests/api.pp4
-rw-r--r--tests/registry.pp4
6 files changed, 30 insertions, 30 deletions
diff --git a/examples/single.pp b/examples/single.pp
index 658c1f8..5eecfe9 100644
--- a/examples/single.pp
+++ b/examples/single.pp
@@ -12,8 +12,8 @@ node glance {
12node glance_keystone { 12node glance_keystone {
13 class { 'keystone::config::sqlite': } 13 class { 'keystone::config::sqlite': }
14 class { 'keystone': 14 class { 'keystone':
15 log_verbose => true, 15 verbose => true,
16 log_debug => true, 16 debug => true,
17 catalog_type => 'sql', 17 catalog_type => 'sql',
18 } 18 }
19 class { 'keystone::roles::admin': } 19 class { 'keystone::roles::admin': }
@@ -24,8 +24,8 @@ node glance_keystone {
24node glance_keystone_mysql { 24node glance_keystone_mysql {
25 class { 'mysql::server': } 25 class { 'mysql::server': }
26 class { 'keystone': 26 class { 'keystone':
27 log_verbose => true, 27 verbose => true,
28 log_debug => true, 28 debug => true,
29 catalog_type => 'sql', 29 catalog_type => 'sql',
30 } 30 }
31 class { 'keystone::db::mysql': 31 class { 'keystone::db::mysql':
@@ -46,8 +46,8 @@ node default {
46class role_glance_sqlite { 46class role_glance_sqlite {
47 47
48 class { 'glance::api': 48 class { 'glance::api':
49 log_verbose => 'True', 49 verbose => 'True',
50 log_debug => 'True', 50 debug => 'True',
51 auth_type => 'keystone', 51 auth_type => 'keystone',
52 keystone_tenant => 'services', 52 keystone_tenant => 'services',
53 keystone_user => 'glance', 53 keystone_user => 'glance',
@@ -56,8 +56,8 @@ class role_glance_sqlite {
56 class { 'glance::backend::file': } 56 class { 'glance::backend::file': }
57 57
58 class { 'glance::registry': 58 class { 'glance::registry':
59 log_verbose => 'True', 59 verbose => 'True',
60 log_debug => 'True', 60 debug => 'True',
61 auth_type => 'keystone', 61 auth_type => 'keystone',
62 keystone_tenant => 'services', 62 keystone_tenant => 'services',
63 keystone_user => 'glance', 63 keystone_user => 'glance',
@@ -69,8 +69,8 @@ class role_glance_sqlite {
69class role_glance_mysql { 69class role_glance_mysql {
70 70
71 class { 'glance::api': 71 class { 'glance::api':
72 log_verbose => 'True', 72 verbose => 'True',
73 log_debug => 'True', 73 debug => 'True',
74 auth_type => 'keystone', 74 auth_type => 'keystone',
75 keystone_tenant => 'services', 75 keystone_tenant => 'services',
76 keystone_user => 'glance', 76 keystone_user => 'glance',
@@ -88,8 +88,8 @@ class role_glance_mysql {
88 } 88 }
89 89
90 class { 'glance::registry': 90 class { 'glance::registry':
91 log_verbose => 'True', 91 verbose => 'True',
92 log_debug => 'True', 92 debug => 'True',
93 auth_type => 'keystone', 93 auth_type => 'keystone',
94 keystone_tenant => 'services', 94 keystone_tenant => 'services',
95 keystone_user => 'glance', 95 keystone_user => 'glance',
diff --git a/manifests/api.pp b/manifests/api.pp
index 7fd412e..a672155 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -2,10 +2,10 @@
2# 2#
3# == Paremeters: 3# == Paremeters:
4# 4#
5# $log_verbose - rather to log the glance api service at verbose level. 5# $verbose - rather to log the glance api service at verbose level.
6# Optional. Default: false 6# Optional. Default: false
7# 7#
8# $log_debug - rather to log the glance api service at debug level. 8# $debug - rather to log the glance api service at debug level.
9# Optional. Default: false 9# Optional. Default: false
10# 10#
11# $default_store - Backend used to store glance dist images. 11# $default_store - Backend used to store glance dist images.
@@ -28,8 +28,8 @@
28# 28#
29# 29#
30class glance::api( 30class glance::api(
31 $log_verbose = 'False', 31 $verbose = 'False',
32 $log_debug = 'False', 32 $debug = 'False',
33 $bind_host = '0.0.0.0', 33 $bind_host = '0.0.0.0',
34 $bind_port = '9292', 34 $bind_port = '9292',
35 $backlog = '4096', 35 $backlog = '4096',
@@ -87,8 +87,8 @@ class glance::api(
87 87
88 # basic service config 88 # basic service config
89 glance_api_config { 89 glance_api_config {
90 'DEFAULT/verbose': value => $log_verbose; 90 'DEFAULT/verbose': value => $verbose;
91 'DEFAULT/debug': value => $log_debug; 91 'DEFAULT/debug': value => $debug;
92 'DEFAULT/bind_host': value => $bind_host; 92 'DEFAULT/bind_host': value => $bind_host;
93 'DEFAULT/bind_port': value => $bind_port; 93 'DEFAULT/bind_port': value => $bind_port;
94 'DEFAULT/backlog': value => $backlog; 94 'DEFAULT/backlog': value => $backlog;
@@ -97,8 +97,8 @@ class glance::api(
97 } 97 }
98 98
99 glance_cache_config { 99 glance_cache_config {
100 'DEFAULT/verbose': value => $log_verbose; 100 'DEFAULT/verbose': value => $verbose;
101 'DEFAULT/debug': value => $log_debug; 101 'DEFAULT/debug': value => $debug;
102 } 102 }
103 103
104 # configure api service to connect registry service 104 # configure api service to connect registry service
diff --git a/manifests/registry.pp b/manifests/registry.pp
index 3b48404..64ab672 100644
--- a/manifests/registry.pp
+++ b/manifests/registry.pp
@@ -1,6 +1,6 @@
1class glance::registry( 1class glance::registry(
2 $log_verbose = 'False', 2 $verbose = 'False',
3 $log_debug = 'False', 3 $debug = 'False',
4 $bind_host = '0.0.0.0', 4 $bind_host = '0.0.0.0',
5 $bind_port = '9191', 5 $bind_port = '9191',
6 $log_file = '/var/log/glance/registry.log', 6 $log_file = '/var/log/glance/registry.log',
@@ -47,8 +47,8 @@ class glance::registry(
47 47
48 # basic service config 48 # basic service config
49 glance_registry_config { 49 glance_registry_config {
50 'DEFAULT/verbose': value => $log_verbose; 50 'DEFAULT/verbose': value => $verbose;
51 'DEFAULT/debug': value => $log_debug; 51 'DEFAULT/debug': value => $debug;
52 'DEFAULT/bind_host': value => $bind_host; 52 'DEFAULT/bind_host': value => $bind_host;
53 'DEFAULT/bind_port': value => $bind_port; 53 'DEFAULT/bind_port': value => $bind_port;
54 } 54 }
diff --git a/spec/classes/glance_registry_spec.rb b/spec/classes/glance_registry_spec.rb
index d710c19..8a6b871 100644
--- a/spec/classes/glance_registry_spec.rb
+++ b/spec/classes/glance_registry_spec.rb
@@ -10,8 +10,8 @@ describe 'glance::registry' do
10 10
11 let :default_params do 11 let :default_params do
12 { 12 {
13 :log_verbose => 'False', 13 :verbose => 'False',
14 :log_debug => 'False', 14 :debug => 'False',
15 :bind_host => '0.0.0.0', 15 :bind_host => '0.0.0.0',
16 :bind_port => '9191', 16 :bind_port => '9191',
17 :log_file => '/var/log/glance/registry.log', 17 :log_file => '/var/log/glance/registry.log',
diff --git a/tests/api.pp b/tests/api.pp
index ff20367..1664b19 100644
--- a/tests/api.pp
+++ b/tests/api.pp
@@ -1,4 +1,4 @@
1class { 'glance::api': 1class { 'glance::api':
2 log_debug => 'true', 2 debug => 'true',
3 log_verbose => 'true', 3 verbose => 'true',
4} 4}
diff --git a/tests/registry.pp b/tests/registry.pp
index 49c6b4a..11fe4e4 100644
--- a/tests/registry.pp
+++ b/tests/registry.pp
@@ -1,4 +1,4 @@
1class { 'glance::registry': 1class { 'glance::registry':
2 log_debug =>'true', 2 debug =>'true',
3 log_verbose => 'true', 3 verbose => 'true',
4} 4}