summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2013-05-23 12:11:06 +0200
committerJulien Danjou <julien@danjou.info>2013-06-10 10:19:00 +0200
commit7bf5c100775b4a859c3ef487cf6dfe1c460ede30 (patch)
tree7e8478725ee0772ef5ed978f1855f6b1414c43f6 /nova/utils.py
parente0142d0f63bf64a07db3bd3b840fc2072d2e6ca3 (diff)
downloadnova-7bf5c100775b4a859c3ef487cf6dfe1c460ede30.tar.gz
nova-7bf5c100775b4a859c3ef487cf6dfe1c460ede30.tar.xz
nova-7bf5c100775b4a859c3ef487cf6dfe1c460ede30.zip
Enhance group handling in extract_opts
When there's 2 options with the same name, the script gets confused and doesn't know in which group it goes. This fixes it, and fixes also the template generation which is broken for various reasons: - gettext.install was missing - nova-rootwrap when imported calls exit() because it doesn't find a valid configuration file, so let's exclude it entirely anyway - eventlet/greendns needs to be ignored for this Change-Id: Iaa4e9a806e79032ce1675b46a6b7a7628c3eff89 Signed-off-by: Julien Danjou <julien@danjou.info>
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 2b488a7e7..9067488d5 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -68,9 +68,6 @@ utils_opts = [
cfg.IntOpt('password_length',
default=12,
help='Length of generated instance admin passwords'),
- 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. '