Merge pull request #4 from gandelman-a/master

Allow modification of debug configuration option in templates

manifests/api.pp

@@ -1,5 +1,6 @@
 class glance::api(
-  $verbose = 'false',
+  $log_verbose = 'false',
+  $log_debug = 'false',
   $default_store = 'file',
   $bind_host = '0.0.0.0',
   $bind_port = '9292',

manifests/registry.pp

@@ -1,6 +1,6 @@
 class glance::registry(
-  $verbose = 'true',
-  $debug = 'true',
+  $log_verbose = 'false',
+  $log_debug = 'false',
   $bind_host = '0.0.0.0',
   $bind_port = '9191',
   $log_file = '/var/log/glance/registry.log',

templates/glance-api.conf.erb

@@ -1,9 +1,9 @@
 [DEFAULT]
 # Show more verbose log output (sets INFO log level output)
-verbose = <%= verbose %>
+verbose = <%= log_verbose %>
 
 # Show debugging output in logs (sets DEBUG log level output)
-debug = False
+debug = <%= log_debug %>
 
 # Which backend store should Glance use by default is not specified
 # in a request to add a new image to Glance? Default: 'file'

templates/glance-registry.conf.erb

@@ -1,9 +1,9 @@
 [DEFAULT]
 # Show more verbose log output (sets INFO log level output)
-verbose = <%= verbose %>
+verbose = <%= log_verbose %>
 
 # Show debugging output in logs (sets DEBUG log level output)
-debug = False
+debug = <%= log_debug %>
 
 # Address to bind the registry server
 bind_host = 0.0.0.0

tests/api.pp

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

tests/registry.pp

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