From: yangyan <yangyanyj@chinamobile.com>
Date: Thu, 26 Apr 2018 07:37:35 +0000 (+0800)
Subject: Fix SDC IP address
X-Git-Tag: v1.1.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=935f01e47684463bda65ed3bc93165c8613b8fe8;p=vfc%2Fnfvo%2Fcatalog.git

Fix SDC IP address

Issue-ID: VFC-887
Change-Id: I7965df6d65f5812d5a5d07cd2dccb954e22ecd89
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

diff --git a/catalog/settings.py b/catalog/settings.py
index 30b7db08..c8f7e0b3 100644
--- a/catalog/settings.py
+++ b/catalog/settings.py
@@ -130,6 +130,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)
 #
 # LOGGING = {
 #     'version': 1,
diff --git a/docker/instance_config.sh b/docker/instance_config.sh
index c76770e3..4e29dc96 100755
--- a/docker/instance_config.sh
+++ b/docker/instance_config.sh
@@ -19,9 +19,9 @@ if [ $REDIS_HOST ]; then
     sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_HOST'|" vfc/nfvo/catalog/catalog/pub/config/config.py
 fi
 
-if [ $SDC_BASE_URL ]; then
-    sed -i "s|SDC_BASE_URL.*|SDC_BASE_URL = '$SDC_BASE_URL'|" vfc/nfvo/catalog/catalog/pub/config/config.py
-fi
+#if [ $SDC_BASE_URL ]; then
+#    sed -i "s|SDC_BASE_URL.*|SDC_BASE_URL = '$SDC_BASE_URL'|" vfc/nfvo/catalog/catalog/pub/config/config.py
+#fi
 
 sed -i "s|DB_NAME.*|DB_NAME = 'nfvocatalog'|" vfc/nfvo/catalog/catalog/pub/config/config.py
 sed -i "s|DB_USER.*|DB_USER = 'nfvocatalog'|" vfc/nfvo/catalog/catalog/pub/config/config.py