Merge "update sonar property: sonar.python.coverage.reportPath -> sonar.python.covera...

[vfc/nfvo/catalog.git] / catalog / settings.py

diff --git a/catalog/settings.py b/catalog/settings.py
index 67b58b9..4eebb46 100644 (file)
--- a/catalog/settings.py
+++ b/catalog/settings.py
@@ -16,7 +16,7 @@ import os
 import sys
 import platform
 
-import redisco
+import catalog.pub.redisco
 
 from catalog.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD
 from catalog.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT
@@ -47,6 +47,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.admin',
     'rest_framework',
     'catalog.pub.database',
     'catalog.samples',
@@ -115,7 +116,7 @@ DATABASES = {
     },
 }
 
-redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0)
+catalog.pub.redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0)
 # CACHE_BACKEND = 'redis_cache.cache://%s@%s:%s' % (REDIS_PASSWD, REDIS_HOST, REDIS_PORT)
 
 TIME_ZONE = 'UTC'
@@ -131,7 +132,7 @@ STATICFILES_DIRS = [
 
 pub_config.CATALOG_ROOT_PATH = os.path.join(STATICFILES_DIRS[0], "catalog")
 pub_config.CATALOG_URL_PATH = "static/catalog"
-pub_config.SDC_BASE_URL = "http://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
+pub_config.SDC_BASE_URL = "https://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
 
 if platform.system() == 'Windows' or 'test' in sys.argv:
     LOGGING = {
@@ -161,6 +162,11 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
                 'level': 'DEBUG',
                 'propagate': False
             },
+            'tosca': {
+                'handlers': ['catalog_handler'],
+                'level': 'DEBUG',
+                'propagate': False
+            },
         }
     }
 else: