messaging: stop using global config

Change-Id: I97840aa9d1249deeba91dcdb6a5d23eca2fecdf1

1 files changed, 2 insertions, 3 deletions

diff --git a/ceilometer/messaging.py b/ceilometer/messaging.py
index 7b325077..8f8211be 100644
--- a/ceilometer/messaging.py
+++ b/ceilometer/messaging.py
@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_config import cfg
 import oslo_messaging
 from oslo_messaging import serializer as oslo_serializer
 
@@ -25,14 +24,14 @@ def setup():
     oslo_messaging.set_transport_defaults('ceilometer')
 
 
-def get_transport(url=None, optional=False, cache=True):
+def get_transport(conf, url=None, optional=False, cache=True):
     """Initialise the oslo_messaging layer."""
     global TRANSPORTS, DEFAULT_URL
     cache_key = url or DEFAULT_URL
     transport = TRANSPORTS.get(cache_key)
     if not transport or not cache:
         try:
-            transport = oslo_messaging.get_transport(cfg.CONF, url)
+            transport = oslo_messaging.get_transport(conf, url)
         except (oslo_messaging.InvalidTransportURL,
                 oslo_messaging.DriverLoadFailure):
             if not optional or url: