Update to get configuration from the consul

Change-Id: I0367e49caa00462fde20dcf83667788492a6bb0d

diff --git a/moonv4/moon_manager/moon_manager/messenger.py b/moonv4/moon_manager/moon_manager/messenger.py
index 3c44b6f..76ba6da 100644 (file)
--- a/moonv4/moon_manager/moon_manager/messenger.py
+++ b/moonv4/moon_manager/moon_manager/messenger.py
@@ -15,8 +15,9 @@ from moon_manager.api.pdp import PDP
 from moon_manager.api.master import Master
 from moon_utilities.security_functions import call
 from moon_utilities.exceptions import IntraExtensionUnknown
+from moon_utilities import configuration
 
-LOG = logging.getLogger(__name__)
+LOG = logging.getLogger("moon.manager.messenger")
 CONF = cfg.CONF
 
 
@@ -24,6 +25,7 @@ class Server:
 
     def __init__(self):
         self.TOPIC = "moon_manager"
+        cfg.CONF.transport_url = self.__get_transport_url()
         self.transport = oslo_messaging.get_transport(cfg.CONF)
         self.target = oslo_messaging.Target(topic=self.TOPIC, server='moon_manager_server1')
         # ctx = {'user_id': 'admin', 'id': intra_extension_id, 'method': 'get_intra_extensions'}
@@ -60,6 +62,11 @@ class Server:
                                                     executor='threading',
                                                     access_policy=oslo_messaging.DefaultRPCAccessPolicy)
 
+    @staticmethod
+    def __get_transport_url():
+        messenger = configuration.get_configuration(configuration.MESSENGER)["messenger"]
+        return messenger['url']
+
     def run(self):
         try:
             self.server.start()

diff --git a/moonv4/moon_manager/moon_manager/server.py b/moonv4/moon_manager/moon_manager/server.py
index 715a74c..56ba1e9 100644 (file)
--- a/moonv4/moon_manager/moon_manager/server.py
+++ b/moonv4/moon_manager/moon_manager/server.py
@@ -6,10 +6,10 @@
 import os
 from oslo_config import cfg
 from oslo_log import log as logging
-from moon_utilities import options  # noqa
+from moon_utilities import configuration
 from moon_manager.messenger import Server
 
-LOG = logging.getLogger(__name__)
+LOG = logging.getLogger("moon.manager")
 CONF = cfg.CONF
 DOMAIN = "moon_manager"
 
@@ -17,6 +17,8 @@ __CWD__ = os.path.dirname(os.path.abspath(__file__))
 
 
 def main():
+    configuration.init_logging()
+    configuration.add_component("manager", "manager")
     server = Server()
     server.run()