Browse Source

switch log_verbose,log_debug to debug,verbose

tags/1.0.0
Dan Bode 6 years ago
parent
commit
4cd8cf36a3
6 changed files with 30 additions and 30 deletions
  1. 12
    12
      examples/single.pp
  2. 8
    8
      manifests/api.pp
  3. 4
    4
      manifests/registry.pp
  4. 2
    2
      spec/classes/glance_registry_spec.rb
  5. 2
    2
      tests/api.pp
  6. 2
    2
      tests/registry.pp

+ 12
- 12
examples/single.pp View File

@@ -12,8 +12,8 @@ node glance {
12 12
 node glance_keystone {
13 13
   class { 'keystone::config::sqlite': }
14 14
   class { 'keystone':
15
-    log_verbose  => true,
16
-    log_debug    => true,
15
+    verbose  => true,
16
+    debug    => true,
17 17
     catalog_type => 'sql',
18 18
   }
19 19
   class { 'keystone::roles::admin': }
@@ -24,8 +24,8 @@ node glance_keystone {
24 24
 node glance_keystone_mysql {
25 25
   class { 'mysql::server': }
26 26
   class { 'keystone':
27
-    log_verbose  => true,
28
-    log_debug    => true,
27
+    verbose  => true,
28
+    debug    => true,
29 29
     catalog_type => 'sql',
30 30
   }
31 31
   class { 'keystone::db::mysql':
@@ -46,8 +46,8 @@ node default {
46 46
 class role_glance_sqlite {
47 47
 
48 48
   class { 'glance::api':
49
-    log_verbose       => 'True',
50
-    log_debug         => 'True',
49
+    verbose       => 'True',
50
+    debug         => 'True',
51 51
     auth_type         => 'keystone',
52 52
     keystone_tenant   => 'services',
53 53
     keystone_user     => 'glance',
@@ -56,8 +56,8 @@ class role_glance_sqlite {
56 56
   class { 'glance::backend::file': }
57 57
 
58 58
   class { 'glance::registry':
59
-    log_verbose       => 'True',
60
-    log_debug         => 'True',
59
+    verbose       => 'True',
60
+    debug         => 'True',
61 61
     auth_type         => 'keystone',
62 62
     keystone_tenant   => 'services',
63 63
     keystone_user     => 'glance',
@@ -69,8 +69,8 @@ class role_glance_sqlite {
69 69
 class role_glance_mysql {
70 70
 
71 71
   class { 'glance::api':
72
-    log_verbose       => 'True',
73
-    log_debug         => 'True',
72
+    verbose       => 'True',
73
+    debug         => 'True',
74 74
     auth_type         => 'keystone',
75 75
     keystone_tenant   => 'services',
76 76
     keystone_user     => 'glance',
@@ -88,8 +88,8 @@ class role_glance_mysql {
88 88
   }
89 89
 
90 90
   class { 'glance::registry':
91
-    log_verbose       => 'True',
92
-    log_debug         => 'True',
91
+    verbose       => 'True',
92
+    debug         => 'True',
93 93
     auth_type         => 'keystone',
94 94
     keystone_tenant   => 'services',
95 95
     keystone_user     => 'glance',

+ 8
- 8
manifests/api.pp View File

@@ -2,10 +2,10 @@
2 2
 #
3 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 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 9
 #  Optional. Default: false
10 10
 #
11 11
 #  $default_store - Backend used to store glance dist images.
@@ -28,8 +28,8 @@
28 28
 #
29 29
 #
30 30
 class glance::api(
31
-  $log_verbose       = 'False',
32
-  $log_debug         = 'False',
31
+  $verbose           = 'False',
32
+  $debug             = 'False',
33 33
   $bind_host         = '0.0.0.0',
34 34
   $bind_port         = '9292',
35 35
   $backlog           = '4096',
@@ -87,8 +87,8 @@ class glance::api(
87 87
 
88 88
   # basic service config
89 89
   glance_api_config {
90
-    'DEFAULT/verbose':   value => $log_verbose;
91
-    'DEFAULT/debug':     value => $log_debug;
90
+    'DEFAULT/verbose':   value => $verbose;
91
+    'DEFAULT/debug':     value => $debug;
92 92
     'DEFAULT/bind_host': value => $bind_host;
93 93
     'DEFAULT/bind_port': value => $bind_port;
94 94
     'DEFAULT/backlog':   value => $backlog;
@@ -97,8 +97,8 @@ class glance::api(
97 97
   }
98 98
 
99 99
   glance_cache_config {
100
-    'DEFAULT/verbose':   value => $log_verbose;
101
-    'DEFAULT/debug':     value => $log_debug;
100
+    'DEFAULT/verbose':   value => $verbose;
101
+    'DEFAULT/debug':     value => $debug;
102 102
   }
103 103
 
104 104
   # configure api service to connect registry service

+ 4
- 4
manifests/registry.pp View File

@@ -1,6 +1,6 @@
1 1
 class glance::registry(
2
-  $log_verbose       = 'False',
3
-  $log_debug         = 'False',
2
+  $verbose       = 'False',
3
+  $debug         = 'False',
4 4
   $bind_host         = '0.0.0.0',
5 5
   $bind_port         = '9191',
6 6
   $log_file          = '/var/log/glance/registry.log',
@@ -47,8 +47,8 @@ class glance::registry(
47 47
 
48 48
   # basic service config
49 49
   glance_registry_config {
50
-    'DEFAULT/verbose':   value => $log_verbose;
51
-    'DEFAULT/debug':     value => $log_debug;
50
+    'DEFAULT/verbose':   value => $verbose;
51
+    'DEFAULT/debug':     value => $debug;
52 52
     'DEFAULT/bind_host': value => $bind_host;
53 53
     'DEFAULT/bind_port': value => $bind_port;
54 54
   }

+ 2
- 2
spec/classes/glance_registry_spec.rb View File

@@ -10,8 +10,8 @@ describe 'glance::registry' do
10 10
 
11 11
   let :default_params do
12 12
     {
13
-      :log_verbose      => 'False',
14
-      :log_debug        => 'False',
13
+      :verbose      => 'False',
14
+      :debug        => 'False',
15 15
       :bind_host        => '0.0.0.0',
16 16
       :bind_port        => '9191',
17 17
       :log_file         => '/var/log/glance/registry.log',

+ 2
- 2
tests/api.pp View File

@@ -1,4 +1,4 @@
1 1
 class { 'glance::api':
2
-  log_debug => 'true',
3
-  log_verbose => 'true',
2
+  debug => 'true',
3
+  verbose => 'true',
4 4
 }

+ 2
- 2
tests/registry.pp View File

@@ -1,4 +1,4 @@
1 1
 class { 'glance::registry':
2
-  log_debug =>'true',
3
-  log_verbose => 'true',
2
+  debug =>'true',
3
+  verbose => 'true',
4 4
 }

Loading…
Cancel
Save