summaryrefslogtreecommitdiff
path: root/nova/virt/hyperv/pathutils.py
diff options
context:
space:
mode:
authorAlessandro Pilotti <ap@pilotti.it>2013-03-03 00:12:21 +0200
committerAlessandro Pilotti <ap@pilotti.it>2013-03-05 16:57:50 +0200
commiteed3bce42531b10ec94c518de29fee7092f48f15 (patch)
tree08276ea6d02366c82294bc9558bd6d95a8ea63cb /nova/virt/hyperv/pathutils.py
parentd5e728ca08e250ee537f5bbf0f7c2df4c899c76b (diff)
downloadnova-eed3bce42531b10ec94c518de29fee7092f48f15.tar.gz
Moves Hyper-V options to the hyperv section
Fixes Bug: 1140778 Due to the large number of options available in Nova, in order to achieve better option organization and naming (e.g. avoid the hyperv_* prefix) and to avoid option name clashes, options specific to the Hyper-V driver are moved to a section named "hyperv". Backwards compatibility is mantained by providing the "deprecated_group" argument in option definitions. For case consistency the group name as been changed to "hyperv" for options introduced in Grizzly belonging to the group "HYPERV" Change-Id: If2710822cdf6e4ae108a6d1e7977735ac8104a2e
Diffstat (limited to 'nova/virt/hyperv/pathutils.py')
-rw-r--r--nova/virt/hyperv/pathutils.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/hyperv/pathutils.py b/nova/virt/hyperv/pathutils.py
index 1297cd1edb..dce6e5459f 100644
--- a/nova/virt/hyperv/pathutils.py
+++ b/nova/virt/hyperv/pathutils.py
@@ -35,7 +35,7 @@ hyperv_opts = [
]
CONF = cfg.CONF
-CONF.register_opts(hyperv_opts, 'HYPERV')
+CONF.register_opts(hyperv_opts, 'hyperv')
CONF.import_opt('instances_path', 'nova.compute.manager')
@@ -70,8 +70,8 @@ class PathUtils(object):
local_instance_path = os.path.normpath(CONF.instances_path)
if remote_server:
- if CONF.HYPERV.instances_path_share:
- path = CONF.HYPERV.instances_path_share
+ if CONF.hyperv.instances_path_share:
+ path = CONF.hyperv.instances_path_share
else:
# Use an administrative share
path = local_instance_path.replace(':', '$')