Set volume usage audit period to not NoneType

The setting of NoneType causes cinder-volume-usage-audit to not start up
and throw a stacktrace. This sets the config default back to something
it can use.

Change-Id: I4a9751025486b77dd7cf45d0aaad02e2325055d4
Closes-Bug: #1320541

diff --git a/cinder/common/config.py b/cinder/common/config.py
index 09e2d36db5fb00f2507b68516a31b83a87ead17f..ce51bb911e49f25b79c9973eaf6857fd007a579a 100644 (file)
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -157,6 +157,7 @@ global_opts = [
                default=None,
                help='Default volume type to use'),
     cfg.StrOpt('volume_usage_audit_period',
+               default='month',
                help='Time period for which to generate volume usages. '
                     'The options are hour, day, month, or year.'),
     cfg.StrOpt('rootwrap_config',

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 4827fcb2499339fbc63c9923cfa29c9ce4b08d22..11603c73a675a6c621c7529bb8c99b61934f9ae7 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -543,7 +543,7 @@
 
 # Time period for which to generate volume usages. The options
 # are hour, day, month, or year. (string value)
-#volume_usage_audit_period=<None>
+#volume_usage_audit_period=month
 
 # Path to the rootwrap configuration file to use for running
 # commands as root (string value)