X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fsettings.py;h=81127b81a0998a4fabf009b2d72262b4978c8cbc;hb=46bd3041d522ddce28ae3450e98c9c49b44b02cc;hp=cbb90d7fa5496255a07598137d60ab844d848334;hpb=824413f6f354330f868b38a2ec8cb93b3c8d2808;p=modeling%2Fetsicatalog.git diff --git a/catalog/settings.py b/catalog/settings.py index cbb90d7..81127b8 100644 --- a/catalog/settings.py +++ b/catalog/settings.py @@ -13,16 +13,14 @@ # limitations under the License. import os -import sys import platform +import sys +from logging import config as log_config -# import catalog.pub.redisco +from onaplogging import monkey -# 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 from catalog.pub.config import config as pub_config -from logging import config as log_config -from onaplogging import monkey +from catalog.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT monkey.patch_all() @@ -139,7 +137,6 @@ 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 = "https://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT) if platform.system() == 'Windows' or 'test' in sys.argv: LOGGING = {