2 files changed, 28 insertions, 10 deletions
diff --git a/windriver/titanium_cloud/pub/config/log.yml b/windriver/titanium_cloud/pub/config/log.yml
index 280980d0..cb61b526 100644
--- a/windriver/titanium_cloud/pub/config/log.yml
+++ b/windriver/titanium_cloud/pub/config/log.yml
@@ -1,31 +1,38 @@
+
 version: 1
 disable_existing_loggers: False
 
 loggers:
-    titanium_cloud:
-      handlers: [titanium_cloud_handler]
+    starlingx_base:
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
-    newton_base:
-      handlers: [titanium_cloud_handler]
+    starlingx:
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
-    common:
-      handlers: [titanium_cloud_handler]
+    newton_base:
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
-    starlingx_base:
-      handlers: [titanium_cloud_handler]
+    common:
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
+
 handlers:
-    titanium_cloud_handler:
+    console_handler:
+        level: "DEBUG"
+        class: "logging.StreamHandler"
+        formatter: "standard"
+    file_handler:
         level: "DEBUG"
         class: "logging.handlers.RotatingFileHandler"
         filename: "/var/log/onap/multicloud/openstack/windriver/titanium_cloud.log"
         formatter: "standard"
         maxBytes: 52428800
         backupCount: 10
+
 formatters:
     standard:
         format: "%(asctime)s|||||%(name)s||%(thread)||%(funcName)s||%(levelname)s||%(message)s"
diff --git a/windriver/titanium_cloud/settings.py b/windriver/titanium_cloud/settings.py
index eee2f1d6..8a4be612 100644
--- a/windriver/titanium_cloud/settings.py
+++ b/windriver/titanium_cloud/settings.py
@@ -80,7 +80,10 @@ STATIC_URL = '/static/'
 
 DEFAULT_MSB_PROTO = "http"
 DEFAULT_MSB_ADDR = "127.0.0.1"
-DEFAULT_CACHE_BACKEND_LOCATION = '127.0.0.1:11211'
+# DEFAULT_CACHE_BACKEND_LOCATION = '127.0.0.1:11211'
+MEMCACHED_HOST = os.environ.get('MEMCACHED_HOST', '127.0.0.1')
+MEMCACHED_PORT = os.environ.get('MEMCACHED_PORT', '11211')
+DEFAULT_CACHE_BACKEND_LOCATION = "%s:%s" % (MEMCACHED_HOST, MEMCACHED_PORT)
 
 CACHES = {
     'default': {
@@ -89,6 +92,14 @@ CACHES = {
     }
 }
 
+# [RABBITMQ]
+RABBITMQ_DEFAULT_USER = os.environ.get('RABBITMQ_DEFAULT_USER', 'guest')
+RABBITMQ_DEFAULT_PASS = os.environ.get('RABBITMQ_DEFAULT_PASS', 'guest')
+RABBITMQ_HOST = os.environ.get('RABBITMQ_HOST', 'localhost')
+RABBITMQ_PORT = os.environ.get('RABBITMQ_PORT', '5672')
+RABBITMQ_URL = "amqp://%s:%s@%s:%s//" % (
+    RABBITMQ_DEFAULT_USER, RABBITMQ_DEFAULT_PASS, RABBITMQ_HOST, RABBITMQ_PORT)
+
 # [MSB]
 MSB_SERVICE_PROTOCOL = os.environ.get('MSB_PROTO', DEFAULT_MSB_PROTO)
 MSB_SERVICE_ADDR = os.environ.get('MSB_ADDR', DEFAULT_MSB_ADDR)