parametrize appc/sdnc docker-compose

Change-Id: I91b5475744a7459acece4dd6d5fe9d8c61694f48
Signed-off-by: platania <platania@research.att.com>

diff --git a/boot/appc_vm_init.sh b/boot/appc_vm_init.sh
index bbcf712..6d6d6b2 100644 (file)
--- a/boot/appc_vm_init.sh
+++ b/boot/appc_vm_init.sh
@@ -2,7 +2,7 @@
 
 NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
+export NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
 DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt)
 
 cd /opt/appc

diff --git a/boot/asdc_vm_init.sh b/boot/asdc_vm_init.sh
index 34c9074..024120d 100644 (file)
--- a/boot/asdc_vm_init.sh
+++ b/boot/asdc_vm_init.sh
@@ -3,6 +3,7 @@
 NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
 NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
+NEXUS_DOCKER_PORT=$(echo $NEXUS_DOCKER_REPO | cut -d':' -f2)
 ENV_NAME=$(cat /opt/config/env_name.txt)
 RELEASE=latest
 
@@ -23,4 +24,4 @@ sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \"10.0.11.1,10.0.11.1\",/g" /dat
 sed -i "s/\"fqdn\":.*/\"fqdn\": [\"10.0.11.1\", \"10.0.11.1\"]/g" /data/environments/$ENV_NAME.json
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p 10001
+bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p $NEXUS_DOCKER_PORT

diff --git a/boot/sdnc_vm_init.sh b/boot/sdnc_vm_init.sh
index 353ae6f..d82ad52 100644 (file)
--- a/boot/sdnc_vm_init.sh
+++ b/boot/sdnc_vm_init.sh
@@ -2,7 +2,7 @@
 
 NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
+export NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
 
 cd /opt/sdnc
 git pull