From 51451b626187ae1b6db3015174792fadc3428968 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Wed, 1 Mar 2017 10:06:29 +0800 Subject: Juju connect 1. use open-o docker tag 1.0.0 with nfvo-driver-vnfm-juju tag latest 2. sync juju and open-o tomcat files then start tomcat 3. automatically add vim and vnfm info in open-o Change-Id: I981faf02dda3e2aa7e03304e1a9c790eb629abdf Signed-off-by: Harry Huang --- open-o/openo_docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'open-o/openo_docker.sh') diff --git a/open-o/openo_docker.sh b/open-o/openo_docker.sh index 8639110..d61edf7 100755 --- a/open-o/openo_docker.sh +++ b/open-o/openo_docker.sh @@ -73,7 +73,7 @@ function docker_pull() do echo "Try again" done - until docker pull openoint/nfvo-driver-vnfm-juju:REPLACE_OPENO_TAG + until docker pull openoint/nfvo-driver-vnfm-jujud do echo "Try again" done @@ -188,7 +188,7 @@ function docker_run() docker run -d -e MSB_ADDR=COMMON_SERVICES_MSB_IP:80 --network lab_net --ip NFVO_DRIVER_SDNC_ZTE_IP --name nfvo-driver-sdnc-zte openoint/nfvo-driver-sdnc-zte:REPLACE_OPENO_TAG docker run -d -e MSB_ADDR=COMMON_SERVICES_MSB_IP:80 --network lab_net --ip NFVO_DRIVER_VIM_IP --name nfvo-driver-vim openoint/nfvo-driver-vim:REPLACE_OPENO_TAG docker run -d -e MSB_ADDR=COMMON_SERVICES_MSB_IP:80 --network lab_net --ip NFVO_DRIVER_VNFM_HUAWEI_IP --name nfvo-driver-vnfm-huawei openoint/nfvo-driver-vnfm-huawei:REPLACE_OPENO_TAG - docker run -d -e MSB_ADDR=COMMON_SERVICES_MSB_IP:80 --network lab_net --ip NFVO_DRIVER_VNFM_JUJU_IP --name nfvo-driver-vnfm-juju openoint/nfvo-driver-vnfm-juju:REPLACE_OPENO_TAG + docker run -d -e MSB_ADDR=COMMON_SERVICES_MSB_IP:80 --network lab_net --ip NFVO_DRIVER_VNFM_JUJU_IP --name nfvo-driver-vnfm-juju openoint/nfvo-driver-vnfm-juju docker run -d -e MSB_ADDR=COMMON_SERVICES_MSB_IP:80 --network lab_net --ip NFVO_DRIVER_VNFM_ZTE_IP --name nfvo-driver-vnfm-zte openoint/nfvo-driver-vnfm-zte:REPLACE_OPENO_TAG docker run -d -e MSB_ADDR=COMMON_SERVICES_MSB_IP:80 -e MYSQL_ADDR=COMMON_TOSCA_INVENTORY_IP:3306 --network lab_net --ip NFVO_LCM_IP --name nfvo-lcm openoint/nfvo-lcm:REPLACE_OPENO_TAG docker run -d -e MSB_ADDR=COMMON_SERVICES_MSB_IP:80 --network lab_net --ip NFVO_RESMANAGEMENT_IP --name nfvo-resmanagement openoint/nfvo-resmanagement:REPLACE_OPENO_TAG -- cgit 1.2.3-korg