From 623b80c8e23a4babb41303bd5ad1a23663fcc6b5 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Wed, 20 Sep 2017 18:27:37 -0400 Subject: Fix docker installation in OPEN-O VM Change-Id: Ib636ec64cf2d634bb4db5fff651d18d165fb6bf2 Issue-ID: INT-213 Signed-off-by: Marco Platania --- boot/mvim_vm_init.sh | 4 ++-- boot/openo_all_serv.sh | 11 +++++++++++ boot/openo_install.sh | 14 ++++---------- boot/openo_serv.sh | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 boot/openo_all_serv.sh diff --git a/boot/mvim_vm_init.sh b/boot/mvim_vm_init.sh index 324b1735..ab7a0b2a 100755 --- a/boot/mvim_vm_init.sh +++ b/boot/mvim_vm_init.sh @@ -16,5 +16,5 @@ docker pull $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION docker rm -f multicloud-broker docker rm -f multicloud-vio -docker run -e MS_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9001:9001 --name multicloud-broker framework -docker run -e MS_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9004:9004 --name multicloud-vio vio \ No newline at end of file +docker run -e MS_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9001:9001 --name multicloud-broker $NEXUS_DOCKER_REPO/onap/multicloud/framework:$DOCKER_IMAGE_VERSION +docker run -e MS_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9004:9004 --name multicloud-vio $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION \ No newline at end of file diff --git a/boot/openo_all_serv.sh b/boot/openo_all_serv.sh new file mode 100644 index 00000000..8d45296e --- /dev/null +++ b/boot/openo_all_serv.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +bash /opt/msb_vm_init.sh +sleep 2 +bash /opt/vnfsdk_vm_init.sh +sleep 2 +bash /opt/mvim_vm_init.sh +sleep 2 +bash /opt/vfc_vm_init.sh +sleep 2 +bash /opt/uui_vm_init.sh \ No newline at end of file diff --git a/boot/openo_install.sh b/boot/openo_install.sh index ebf38616..0f36497a 100644 --- a/boot/openo_install.sh +++ b/boot/openo_install.sh @@ -59,18 +59,20 @@ curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/msb_vm_init.sh -o /opt curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mvim_vm_init.sh -o /opt/mvim_vm_init.sh curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/vfc_vm_init.sh -o /opt/vfc_vm_init.sh curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/uui_vm_init.sh -o /opt/uui_vm_init.sh +curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/openo_all_serv.sh -o /opt/openo_all_serv.sh curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/openo_serv.sh -o /opt/openo_serv.sh chmod +x /opt/vnfsdk_vm_init.sh chmod +x /opt/msb_vm_init.sh chmod +x /opt/mvim_vm_init.sh chmod +x /opt/vfc_vm_init.sh chmod +x /opt/uui_vm_init.sh +chmod +x /opt/openo_all_serv.sh chmod +x /opt/openo_serv.sh mv /opt/openo_serv.sh /etc/init.d update-rc.d openo_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine @@ -115,12 +117,4 @@ then reboot fi -./msb_vm_init.sh -sleep 2 -./vnfsdk_vm_init.sh -sleep 2 -./mvim_vm_init.sh -sleep 2 -./vfc_vm_init.sh -sleep 2 -./uui_vm_init.sh \ No newline at end of file +./openo_all_serv.sh \ No newline at end of file diff --git a/boot/openo_serv.sh b/boot/openo_serv.sh index 9d7823ff..0afa931e 100644 --- a/boot/openo_serv.sh +++ b/boot/openo_serv.sh @@ -10,7 +10,7 @@ ### END INIT INFO dir="/opt" -cmd="./msb_vm_init.sh;sleep 2;./vnfsdk_vm_init.sh;sleep 2;./mvim_vm_init.sh;sleep 2;./vfc_vm_init.sh;sleep 2;./uui_vm_init.sh" +cmd="./openo_all_serv.sh" user="root" name=`basename $0` -- cgit 1.2.3-korg