diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-12 18:19:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-12 18:19:20 +0000 |
| commit | 1b3a72492c1ff1d9e596831309137c88bd08706b (patch) | |
| tree | 986d566f14f4ffe5c35466cf67e41eaba6d6bfe5 /nova/utils.py | |
| parent | f3c08f607699cdee5a5f23214ef53feb48a91257 (diff) | |
| parent | 36eef2803356304251f0e124d8e03f6a9cf893d1 (diff) | |
| download | nova-1b3a72492c1ff1d9e596831309137c88bd08706b.tar.gz nova-1b3a72492c1ff1d9e596831309137c88bd08706b.tar.xz nova-1b3a72492c1ff1d9e596831309137c88bd08706b.zip | |
Merge "Move some opts into nova.utils"
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nova/utils.py b/nova/utils.py index 859fe5df8..32f089feb 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -71,6 +71,14 @@ utils_opts = [ cfg.BoolOpt('disable_process_locking', default=False, help='Whether to disable inter-process locks'), + cfg.StrOpt('instance_usage_audit_period', + default='month', + help='time period to generate instance usages for. ' + 'Time period must be hour, day, month or year'), + cfg.StrOpt('rootwrap_config', + default="/etc/nova/rootwrap.conf", + help='Path to the rootwrap configuration file to use for ' + 'running commands as root'), ] CONF = cfg.CONF CONF.register_opts(monkey_patch_opts) @@ -78,8 +86,6 @@ CONF.register_opts(utils_opts) CONF.import_opt('glance_host', 'nova.config') CONF.import_opt('glance_port', 'nova.config') CONF.import_opt('glance_protocol', 'nova.config') -CONF.import_opt('instance_usage_audit_period', 'nova.config') -CONF.import_opt('rootwrap_config', 'nova.config') CONF.import_opt('service_down_time', 'nova.config') LOG = logging.getLogger(__name__) |