summaryrefslogtreecommitdiffstats
path: root/nova/api/openstack/compute/plugins/v3
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-10 22:30:11 +0000
committerGerrit Code Review <review@openstack.org>2013-06-10 22:30:11 +0000
commit2d017a228812f6cbd1ae9bbbcc5d53f1f573ab94 (patch)
treee1d01f66dd99046c17557639591646a71e7b9e93 /nova/api/openstack/compute/plugins/v3
parentbfc1065fc19608a532eaba6e4f54409f9fedf5e7 (diff)
parent7bf5c100775b4a859c3ef487cf6dfe1c460ede30 (diff)
downloadnova-2d017a228812f6cbd1ae9bbbcc5d53f1f573ab94.tar.gz
nova-2d017a228812f6cbd1ae9bbbcc5d53f1f573ab94.tar.xz
nova-2d017a228812f6cbd1ae9bbbcc5d53f1f573ab94.zip
Merge "Enhance group handling in extract_opts"
Diffstat (limited to 'nova/api/openstack/compute/plugins/v3')
-rw-r--r--nova/api/openstack/compute/plugins/v3/servers.py9
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')