Merge "Use openstack.common.cfg.CONF."

9 files changed, 14 insertions, 39 deletions

diff --git a/nova/rpc/__init__.py b/nova/rpc/__init__.py
index 0919efedd..648adfdd2 100644
--- a/nova/rpc/__init__.py
+++ b/nova/rpc/__init__.py
@@ -54,14 +54,7 @@ rpc_opts = [
                 help='If passed, use a fake RabbitMQ provider'),
     ]
 
-_CONF = None
-
-
-def register_opts(conf):
-    global _CONF
-    _CONF = conf
-    _CONF.register_opts(rpc_opts)
-    _get_impl().register_opts(_CONF)
+cfg.CONF.register_opts(rpc_opts)
 
 
 def create_connection(new=True):
@@ -77,7 +70,7 @@ def create_connection(new=True):
 
     :returns: An instance of nova.rpc.common.Connection
     """
-    return _get_impl().create_connection(_CONF, new=new)
+    return _get_impl().create_connection(cfg.CONF, new=new)
 
 
 def call(context, topic, msg, timeout=None):
@@ -99,7 +92,7 @@ def call(context, topic, msg, timeout=None):
     :raises: nova.rpc.common.Timeout if a complete response is not received
              before the timeout is reached.
     """
-    return _get_impl().call(_CONF, context, topic, msg, timeout)
+    return _get_impl().call(cfg.CONF, context, topic, msg, timeout)
 
 
 def cast(context, topic, msg):
@@ -116,7 +109,7 @@ def cast(context, topic, msg):
 
     :returns: None
     """
-    return _get_impl().cast(_CONF, context, topic, msg)
+    return _get_impl().cast(cfg.CONF, context, topic, msg)
 
 
 def fanout_cast(context, topic, msg):
@@ -136,7 +129,7 @@ def fanout_cast(context, topic, msg):
 
     :returns: None
     """
-    return _get_impl().fanout_cast(_CONF, context, topic, msg)
+    return _get_impl().fanout_cast(cfg.CONF, context, topic, msg)
 
 
 def multicall(context, topic, msg, timeout=None):
@@ -165,7 +158,7 @@ def multicall(context, topic, msg, timeout=None):
     :raises: nova.rpc.common.Timeout if a complete response is not received
              before the timeout is reached.
     """
-    return _get_impl().multicall(_CONF, context, topic, msg, timeout)
+    return _get_impl().multicall(cfg.CONF, context, topic, msg, timeout)
 
 
 def notify(context, topic, msg):
@@ -178,7 +171,7 @@ def notify(context, topic, msg):
 
     :returns: None
     """
-    return _get_impl().notify(_CONF, context, topic, msg)
+    return _get_impl().notify(cfg.CONF, context, topic, msg)
 
 
 def cleanup():
@@ -206,7 +199,7 @@ def cast_to_server(context, server_params, topic, msg):
 
     :returns: None
     """
-    return _get_impl().cast_to_server(_CONF, context, server_params, topic,
+    return _get_impl().cast_to_server(cfg.CONF, context, server_params, topic,
                                       msg)
 
 
@@ -222,7 +215,7 @@ def fanout_cast_to_server(context, server_params, topic, msg):
 
     :returns: None
     """
-    return _get_impl().fanout_cast_to_server(_CONF, context, server_params,
+    return _get_impl().fanout_cast_to_server(cfg.CONF, context, server_params,
                                              topic, msg)
 
 
@@ -251,5 +244,5 @@ def _get_impl():
     """Delay import of rpc_backend until configuration is loaded."""
     global _RPCIMPL
     if _RPCIMPL is None:
-        _RPCIMPL = importutils.import_module(_CONF.rpc_backend)
+        _RPCIMPL = importutils.import_module(cfg.CONF.rpc_backend)
     return _RPCIMPL
diff --git a/nova/rpc/impl_fake.py b/nova/rpc/impl_fake.py
index 24ef0e7c1..22bf04939 100644
--- a/nova/rpc/impl_fake.py
+++ b/nova/rpc/impl_fake.py
@@ -182,7 +182,3 @@ def fanout_cast(conf, context, topic, msg):
             consumer.call(context, version, method, args, None)
         except Exception:
             pass
-
-
-def register_opts(conf):
-    pass
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index b9fb081bd..9058a4720 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -82,6 +82,8 @@ kombu_opts = [
 
     ]
 
+cfg.CONF.register_opts(kombu_opts)
+
 LOG = rpc_common.LOG
 
 
@@ -754,7 +756,3 @@ def notify(conf, context, topic, msg):
 
 def cleanup():
     return rpc_amqp.cleanup(Connection.pool)
-
-
-def register_opts(conf):
-    conf.register_opts(kombu_opts)
diff --git a/nova/rpc/impl_qpid.py b/nova/rpc/impl_qpid.py
index 388b99542..ed850339e 100644
--- a/nova/rpc/impl_qpid.py
+++ b/nova/rpc/impl_qpid.py
@@ -78,6 +78,8 @@ qpid_opts = [
                 help='Disable Nagle algorithm'),
     ]
 
+cfg.CONF.register_opts(qpid_opts)
+
 
 class ConsumerBase(object):
     """Consumer base class."""
@@ -575,7 +577,3 @@ def notify(conf, context, topic, msg):
 
 def cleanup():
     return rpc_amqp.cleanup(Connection.pool)
-
-
-def register_opts(conf):
-    conf.register_opts(qpid_opts)
diff --git a/nova/service.py b/nova/service.py
index b179cda6c..ab1fd339a 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -179,7 +179,6 @@ class Service(object):
         LOG.audit(_('Starting %(topic)s node (version %(vcs_string)s)'),
                   {'topic': self.topic, 'vcs_string': vcs_string})
         utils.cleanup_file_locks()
-        rpc.register_opts(FLAGS)
         self.manager.init_host()
         self.model_disconnected = False
         ctxt = context.get_admin_context()
@@ -398,7 +397,6 @@ class WSGIService(object):
 
         """
         utils.cleanup_file_locks()
-        rpc.register_opts(FLAGS)
         if self.manager:
             self.manager.init_host()
         self.server.start()
@@ -439,7 +437,6 @@ def serve(*servers):
 
 def wait():
     LOG.debug(_('Full set of FLAGS:'))
-    rpc.register_opts(FLAGS)
     for flag in FLAGS:
         flag_get = FLAGS.get(flag, None)
         # hide flag contents from log if contains a password
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index d04681935..d1fa17185 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -60,16 +60,12 @@ def reset_db():
 def setup():
     import mox  # Fail fast if you don't have mox. Workaround for bug 810424
 
-    from nova import rpc  # Register rpc_backend before fake_flags sets it
-    FLAGS.register_opts(rpc.rpc_opts)
-
     from nova import context
     from nova import db
     from nova.db import migration
     from nova.network import manager as network_manager
     from nova.tests import fake_flags
     fake_flags.set_defaults(FLAGS)
-    rpc.register_opts(FLAGS)
 
     if FLAGS.sql_connection == "sqlite://":
         if migration.db_version() > migration.INIT_VERSION:
diff --git a/nova/tests/rpc/test_kombu.py b/nova/tests/rpc/test_kombu.py
index a69dcdfe9..0055f253c 100644
--- a/nova/tests/rpc/test_kombu.py
+++ b/nova/tests/rpc/test_kombu.py
@@ -61,7 +61,6 @@ class RpcKombuTestCase(common.BaseRpcAMQPTestCase):
     def setUp(self):
         if kombu:
             self.rpc = impl_kombu
-            impl_kombu.register_opts(FLAGS)
         else:
             self.rpc = None
         super(RpcKombuTestCase, self).setUp()
diff --git a/nova/tests/rpc/test_kombu_ssl.py b/nova/tests/rpc/test_kombu_ssl.py
index e17521981..f74d38492 100644
--- a/nova/tests/rpc/test_kombu_ssl.py
+++ b/nova/tests/rpc/test_kombu_ssl.py
@@ -44,7 +44,6 @@ class RpcKombuSslTestCase(test.TestCase):
     def setUp(self):
         super(RpcKombuSslTestCase, self).setUp()
         if kombu:
-            impl_kombu.register_opts(FLAGS)
             self.flags(kombu_ssl_keyfile=SSL_KEYFILE,
                        kombu_ssl_ca_certs=SSL_CA_CERT,
                        kombu_ssl_certfile=SSL_CERT,
diff --git a/nova/tests/rpc/test_qpid.py b/nova/tests/rpc/test_qpid.py
index c523f3fe3..1b21158f8 100644
--- a/nova/tests/rpc/test_qpid.py
+++ b/nova/tests/rpc/test_qpid.py
@@ -66,7 +66,6 @@ class RpcQpidTestCase(test.TestCase):
         self.mock_receiver = None
 
         if qpid:
-            impl_qpid.register_opts(FLAGS)
             self.orig_connection = qpid.messaging.Connection
             self.orig_session = qpid.messaging.Session
             self.orig_sender = qpid.messaging.Sender