diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-11-04 21:32:51 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-04 22:33:01 +0000 |
| commit | 7931f9a2a556bf38e19f501cac345264ff771d5c (patch) | |
| tree | 53c74d6ba844bd787670ec113239864e289b9cf9 /nova/scheduler/rpcapi.py | |
| parent | 8ce58defbe560b1da34d991b38ac64a9b4c8d654 (diff) | |
| download | nova-7931f9a2a556bf38e19f501cac345264ff771d5c.tar.gz nova-7931f9a2a556bf38e19f501cac345264ff771d5c.tar.xz nova-7931f9a2a556bf38e19f501cac345264ff771d5c.zip | |
Switch from FLAGS to CONF in nova.scheduler
Use the global CONF variable instead of FLAGS. This is purely a cleanup
since FLAGS is already just another reference to CONF.
We leave the nova.flags imports until a later cleanup commit since
removing them may cause unpredictable problems due to config options not
being registered.
Change-Id: Ia3f66aec300fd88e91cef926da735f9e95aa2cc2
Diffstat (limited to 'nova/scheduler/rpcapi.py')
| -rw-r--r-- | nova/scheduler/rpcapi.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index b41668733..cbb6712db 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -18,12 +18,12 @@ Client side of the scheduler manager RPC API. """ +from nova import config from nova import flags from nova.openstack.common import jsonutils import nova.openstack.common.rpc.proxy - -FLAGS = flags.FLAGS +CONF = config.CONF class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): @@ -60,7 +60,7 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): BASE_RPC_API_VERSION = '2.0' def __init__(self): - super(SchedulerAPI, self).__init__(topic=FLAGS.scheduler_topic, + super(SchedulerAPI, self).__init__(topic=CONF.scheduler_topic, default_version=self.BASE_RPC_API_VERSION) def run_instance(self, ctxt, request_spec, admin_password, |