openstack/deb-cinder
Code Issues Proposed changes

Remove references to FLAGS from volume/manager.py

Browse Source 
Note that we still must import flags.py because volume_topic is defined
in the list global_opts in flags.py.

Fixes bug #1153551

Change-Id: I3d37bde4ba895c110390cea92385344ff94cb7d1
This commit is contained in:
Ollie Leahy
2013-03-18 18:05:02 +00:00
parent 4c5f27638f
commit d75671cce0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/volume/manager.py
View File

@@ -69,8 +69,8 @@ volume_manager_opts = [
help='Driver to use for volume creation'),
]
FLAGS = flags.FLAGS
FLAGS.register_opts(volume_manager_opts)
CONF = cfg.CONF
CONF.register_opts(volume_manager_opts)
MAPPING = {
'cinder.volume.driver.RBDDriver': 'cinder.volume.drivers.rbd.RBDDriver',
@@ -332,7 +332,7 @@ class VolumeManager(manager.SchedulerDependentManager):
rescheduled = False
try:
method_args = (FLAGS.volume_topic, volume_id, snapshot_id,
method_args = (CONF.volume_topic, volume_id, snapshot_id,
image_id, request_spec, filter_properties)
rescheduled = self._reschedule(context, request_spec,