Merge "Imporve dcae2 init scripts"

diff --git a/boot/robot_vm_init.sh b/boot/robot_vm_init.sh
index aca28f5..132fbae 100644 (file)
--- a/boot/robot_vm_init.sh
+++ b/boot/robot_vm_init.sh
@@ -8,7 +8,7 @@ DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 
 #
-# Deploy latest robot configuration 
+# Deploy latest robot configuration
 #
 cd /opt/testsuite/properties
 git pull
@@ -46,11 +46,11 @@ chmod +x /opt/demo.sh
 /bin/bash /opt/eteshare/config/vm_config2robot.sh
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/openecomp/testsuite:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION
 docker rm -f openecompete_container
 
 docker pull $NEXUS_DOCKER_REPO/onap/sniroemulator:latest
 docker rm -f sniroemulator
 
-docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/openecomp/testsuite:$DOCKER_IMAGE_VERSION
+docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION
 docker run -d --name sniroemulator -p 8080:9999 $NEXUS_DOCKER_REPO/onap/sniroemulator:latest

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index e48eec4..d956162 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -987,6 +987,8 @@ resources:
             echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
             echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+            echo "__sdc_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
+            echo "__sdc_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
             echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt

diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 89ee63b..0eb5e3e 100644 (file)
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -976,6 +976,8 @@ resources:
             echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
             echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+            echo "__sdc_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
+            echo "__sdc_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
             echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt