From: Ollie Leahy <oliver.leahy@hp.com>
Date: Mon, 18 Mar 2013 18:05:02 +0000 (+0000)
Subject: Remove references to FLAGS from volume/manager.py
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d75671cce045b61e1a00642f815a89c129cda177;p=openstack-build%2Fcinder-build.git

Remove references to FLAGS from volume/manager.py

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
---

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index c317d4e65..9a9c234b2 100644
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -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,