diff options
| author | Julien Danjou <julien@danjou.info> | 2013-05-23 12:11:06 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2013-06-10 10:19:00 +0200 |
| commit | 7bf5c100775b4a859c3ef487cf6dfe1c460ede30 (patch) | |
| tree | 7e8478725ee0772ef5ed978f1855f6b1414c43f6 /nova/api | |
| parent | e0142d0f63bf64a07db3bd3b840fc2072d2e6ca3 (diff) | |
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/api')
| -rw-r--r-- | nova/api/openstack/compute/plugins/v3/servers.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py index d9b2d4a3b..5ba249c78 100644 --- a/nova/api/openstack/compute/plugins/v3/servers.py +++ b/nova/api/openstack/compute/plugins/v3/servers.py @@ -41,14 +41,9 @@ from nova.openstack.common import uuidutils from nova import utils -server_opts = [ - cfg.BoolOpt('enable_instance_password', - default=True, - help='Allows use of instance password during ' - 'server creation'), -] CONF = cfg.CONF -CONF.register_opts(server_opts) +CONF.import_opt('enable_instance_password', + 'nova.api.openstack.compute.servers') CONF.import_opt('network_api_class', 'nova.network') CONF.import_opt('reclaim_instance_interval', 'nova.compute.manager') |