diff options
| author |   dyh <dengyuanhong@chinamobile.com> | 2020-08-07 18:00:32 +0800 |
|---|---|---|
| committer | dyh <dengyuanhong@chinamobile.com> | 2020-08-07 18:01:37 +0800 |
| commit | 9310b420a3dd5860c6e4bca27f1c614fe6074c47 (patch) | |
| tree | 98cdf98720cc3817cd3e6db678b88e8eda691516 /gvnfmadapter/docker | |
| parent | f55871e5007c165c3234c4b38b7b2c5d0c30e94f (diff) | |
Don't modify the config file with sed in the docker entrypoint script
Change-Id: I6c8c927b9d2f61d2d490405346f6e35aaf4d3523
Issue-ID: VFC-1623
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
Diffstat (limited to 'gvnfmadapter/docker')
| -rwxr-xr-x | gvnfmadapter/docker/docker-entrypoint.sh | 25 | ||||
| -rwxr-xr-x | gvnfmadapter/docker/instance_config.sh | 31 |
2 files changed, 2 insertions, 54 deletions
diff --git a/gvnfmadapter/docker/docker-entrypoint.sh b/gvnfmadapter/docker/docker-entrypoint.sh index d89ef2e..0b79ef5 100755 --- a/gvnfmadapter/docker/docker-entrypoint.sh +++ b/gvnfmadapter/docker/docker-entrypoint.sh @@ -1,29 +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" - -# 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 - # Configure service based on docker environment variables -vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/docker/instance_config.sh +python vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config.py +cat vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config.py # microservice-specific one-time initialization vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/docker/instance_init.sh diff --git a/gvnfmadapter/docker/instance_config.sh b/gvnfmadapter/docker/instance_config.sh deleted file mode 100755 index 2f45eee..0000000 --- a/gvnfmadapter/docker/instance_config.sh +++ /dev/null @@ -1,31 +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/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py -fi - -if [ $MSB_IP ]; then - sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py -fi - -if [ $MSB_PROTO ]; then - sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py -fi - -if [ $MSB_PORT ]; then - sed -i "s|MSB_SERVICE_PORT = .*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py -fi - -if [ $SERVICE_IP ]; then - sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py -fi - -if [ $SSL_ENABLED ]; then - sed -i "s|SSL_ENABLED = .*|SSL_ENABLED = '$SSL_ENABLED'|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py -fi - -cat vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py |