summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordyh <dengyuanhong@chinamobile.com>2020-08-07 11:57:03 +0800
committerdyh <dengyuanhong@chinamobile.com>2020-08-10 14:31:18 +0800
commit8d7d0c8830bf1c28a726b30069b8c9ede37c8ff2 (patch)
tree0fcfe63a71693d5bd050c5e570c5f2d7311cbf16
parent6315fd304c902ed41a5b1113ec89a04dc9c1162d (diff)
Don't modify the config file with sed in the docker entrypoint script
Change-Id: I71d86943f9a0c0175b9f7b2669511ec9a35fb2d6 Issue-ID: VFC-1623 Signed-off-by: dyh <dengyuanhong@chinamobile.com>
-rwxr-xr-xres/docker/docker-entrypoint.sh38
-rwxr-xr-xres/docker/instance_config.sh47
-rw-r--r--res/res/pub/config/config.py32
3 files changed, 16 insertions, 101 deletions
diff --git a/res/docker/docker-entrypoint.sh b/res/docker/docker-entrypoint.sh
index 0f85abd..a1e7683 100755
--- a/res/docker/docker-entrypoint.sh
+++ b/res/docker/docker-entrypoint.sh
@@ -1,42 +1,8 @@
#!/bin/bash
-if [ -z "$SERVICE_IP" ]; then
- export SERVICE_IP=`hostname -i`
-fi
-echo "SERVICE_IP=$SERVICE_IP"
-
-if [ -z "$MSB_ADDR" ]; then
- echo "Missing required variable MSB_ADDR: Microservices Service Bus address <ip>:<port>"
- exit 1
-fi
-echo "MSB_ADDR=$MSB_ADDR"
-
-if [ -z "$MYSQL_ADDR" ]; then
- echo "Missing required variable MYSQL_ADDR: <ip>:<port>"
- exit 1
-fi
-echo "MYSQL_ADDR=$MYSQL_ADDR"
-
-# Wait for MSB initialization
-echo "Wait for MSB initialization"
-for i in {1..5}; do
- curl -sS -m 1 $MSB_PROTO://$MSB_ADDR/msb -k > /dev/null
- res=$?
- if [ $res -ne 0 ]; then
- break
- fi
- sleep $i
-done
-
-# Wait for DB initialization
-echo "Wait for DB initialization"
-for i in {1..5}; do
- mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -h`echo $MYSQL_ADDR | cut -d: -f 1` -P`echo $MYSQL_ADDR | cut -d: -f 2` -e "show databases;" > /dev/null && echo "DB initialization completed" && break
- sleep $i && echo "`echo $MYSQL_ADDR | cut -d: -f 1` connection failed"
-done
-
# Configure service based on docker environment variables
-vfc/gvnfm/vnfres/res/docker/instance_config.sh
+python vfc/gvnfm/vnfres/res/res/pub/config/config.py
+cat vfc/gvnfm/vnfres/res/res/pub/config/config.py
# microservice-specific one-time initialization
vfc/gvnfm/vnfres/res/docker/instance_init.sh
diff --git a/res/docker/instance_config.sh b/res/docker/instance_config.sh
deleted file mode 100755
index 3cac097..0000000
--- a/res/docker/instance_config.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-MSB_PROTO=`echo $MSB_PROTO`
-MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
-MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
-if [ $REG_TO_MSB_WHEN_START ]; then
-
- sed -i "s|REG_TO_MSB_WHEN_START = .*|REG_TO_MSB_WHEN_START = '$REG_TO_MSB_WHEN_START'|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
-fi
-
-if [ $MSB_PROTO ]; then
- sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
-fi
-
-if [ $MSB_IP ]; then
- sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
-fi
-
-if [ $MSB_PORT ]; then
- sed -i "s|MSB_SERVICE_PORT = .*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
-fi
-
-if [ $SERVICE_IP ]; then
- sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
-fi
-
-if [ $SSL_ENABLED ]; then
- sed -i "s|SSL_ENABLED = .*|SSL_ENABLED = '$SSL_ENABLED'|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
-fi
-
-# Configure MYSQL
-MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
-MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
-echo "MYSQL_ADDR=$MYSQL_ADDR"
-
-if [ $REDIS_ADDR ]; then
- REDIS_IP=`echo $REDIS_ADDR | cut -d: -f 1`
-else
- REDIS_IP="$MYSQL_ADDR"
-fi
-
-sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
-sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
-#redis
-sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
-
-cat vfc/gvnfm/vnfres/res/res/pub/config/config.py
diff --git a/res/res/pub/config/config.py b/res/res/pub/config/config.py
index c7da90a..996dad6 100644
--- a/res/res/pub/config/config.py
+++ b/res/res/pub/config/config.py
@@ -12,41 +12,37 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# [MSB]
-MSB_SERVICE_PROTOCOL = 'http'
-MSB_SERVICE_IP = '127.0.0.1'
-MSB_SERVICE_PORT = '443'
-MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
+import os
-# [REDIS]
-REDIS_HOST = '127.0.0.1'
-REDIS_PORT = '6379'
-REDIS_PASSWD = ''
+# [MSB]
+MSB_BASE_URL = os.getenv("MSB_HOST", "http://127.0.0.1:80")
+MSB_ENABLED = os.getenv("MSB_ENABLED", True)
# [mysql]
-DB_IP = "127.0.0.1"
-DB_PORT = 3306
+DB_IP = os.getenv("MYSQL_ADDR", "127.0.0.1:3306").split(':')[0]
+DB_PORT = os.getenv("MYSQL_ADDR", "127.0.0.1:3306").split(':')[1]
DB_NAME = "gvnfm"
DB_USER = "gvnfm"
DB_PASSWD = "gvnfm"
+# [REDIS]
+REDIS_HOST = os.getenv("REDIS_HOST", DB_IP)
+REDIS_PORT = '6379'
+REDIS_PASSWD = ''
+
# [MDC]
SERVICE_NAME = "vnfres"
FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST",
"HTTP_X_FORWARDED_SERVER"]
# [register]
-REG_TO_MSB_WHEN_START = True
-SSL_ENABLED = "true"
+REG_TO_MSB_WHEN_START = os.getenv("REG_TO_MSB_WHEN_START", "false")
+SSL_ENABLED = os.getenv("SSL_ENABLED", "false")
REG_TO_MSB_REG_URL = "/api/microservices/v1/services"
-if SSL_ENABLED == "true":
- enable_ssl = "true"
-else:
- enable_ssl = "false"
REG_TO_MSB_REG_PARAM = {
"serviceName": "vnfres",
"version": "v1",
- "enable_ssl": enable_ssl,
+ "enable_ssl": SSL_ENABLED,
"url": "/api/vnfres/v1",
"protocol": "REST",
"visualRange": "1",