From 7ee5c95db62d13d860d51974aa9c0a14404cee56 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Mon, 27 Mar 2017 11:53:39 +0800 Subject: run without sudo Jenkins can't remove some dir generate by sudo and leads to CI error for following tasks. Change codes to run ./opera_launch.sh without sudo Change-Id: Iaebd7e1fbdf413a91cc55c77e1b5c6915cfc86d6 Signed-off-by: Harry Huang --- juju/juju_connect.sh | 55 ++++++++-------- juju/juju_setup.sh | 17 +++-- open-o/openo_docker.sh | 168 ++++++++++++++++++++++++------------------------- opera_launch.sh | 2 +- prepare.sh | 6 +- 5 files changed, 125 insertions(+), 123 deletions(-) diff --git a/juju/juju_connect.sh b/juju/juju_connect.sh index 06191e3..7f33a12 100755 --- a/juju/juju_connect.sh +++ b/juju/juju_connect.sh @@ -10,7 +10,7 @@ function connect_prepare() { - apt-get install -y rsync + sudo apt-get install -y rsync local cmd="tar -zxvf apache-tomcat-8.5.9.tar.gz; \ sudo rm -rf tomcat8 csar; \ @@ -23,50 +23,52 @@ function connect_prepare() function sync_juju_driver_file() { local TOMCAT_DIR=${WORK_DIR}/tomcat - rm -rf ${TOMCAT_DIR} + sudo rm -rf ${TOMCAT_DIR} mkdir -p ${TOMCAT_DIR} connect_prepare - docker cp nfvo-driver-vnfm-juju:/service/webapps/ROOT ${TOMCAT_DIR} - docker cp nfvo-driver-vnfm-juju:/service/etc ${TOMCAT_DIR} + sudo docker cp nfvo-driver-vnfm-juju:/service/webapps/ROOT ${TOMCAT_DIR} + sudo docker cp nfvo-driver-vnfm-juju:/service/etc ${TOMCAT_DIR} file1=${TOMCAT_DIR}/etc/conf/juju_conf.json - sed -i "s/^\(.*\"image-metadata-url\":\).*/\1 \"http:\/\/$juju_client_ip\/images\"\,/g" $file1 - sed -i "s/^\(.*\"network\":\).*/\1 \"juju-net\"\,/g" $file1 - sed -i "s/^\(.*\"use-floating-ip\":\).*/\1 \"True\"\,/g" $file1 + sudo sed -i "s/^\(.*\"image-metadata-url\":\).*/\1 \"http:\/\/$juju_client_ip\/images\"\,/g" $file1 + sudo sed -i "s/^\(.*\"network\":\).*/\1 \"juju-net\"\,/g" $file1 + sudo sed -i "s/^\(.*\"use-floating-ip\":\).*/\1 \"True\"\,/g" $file1 file2=${TOMCAT_DIR}/etc/csarInfo/csarinfo.json - sed -i "s/^\(.*\"csar_file_path\":\).*/\1 \"\/home\/ubuntu\/csar\/\"\,/g" $file2 + sudo sed -i "s/^\(.*\"csar_file_path\":\).*/\1 \"\/home\/ubuntu\/csar\/\"\,/g" $file2 file3=${TOMCAT_DIR}/ROOT/WEB-INF/classes/db.properties - sed -i "s/^\(.*jdbc.url=\).*/\1jdbc:mysql:\/\/$OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_MYSQL_PORT\/jujuvnfmdb/g" $file3 + sudo sed -i "s/^\(.*jdbc.url=\).*/\1jdbc:mysql:\/\/$OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_MYSQL_PORT\/jujuvnfmdb/g" $file3 file4=${TOMCAT_DIR}/ROOT/WEB-INF/classes/juju-config.properties - sed -i "s/^\(.*charmPath=\).*/\1\/home\/ubuntu\/csar\//g" $file4 - sed -i "s/^\(.*grant_jujuvnfm_url=\).*/\1http:\/\/$OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_PORT\//g" $file4 + sudo sed -i "s/^\(.*charmPath=\).*/\1\/home\/ubuntu\/csar\//g" $file4 + sudo sed -i "s/^\(.*grant_jujuvnfm_url=\).*/\1http:\/\/$OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_PORT\//g" $file4 file5=${TOMCAT_DIR}/etc/conf/restclient.json - sed -i "s/^\(.*\"host\":\).*/\1\"$OPENO_IP\"\,/g" $file5 - sed -i "s|^\(.*\"port\":\).*|\1\"$COMMON_SERVICES_MSB_PORT\"|g" $file5 + sudo sed -i "s/^\(.*\"host\":\).*/\1\"$OPENO_IP\"\,/g" $file5 + sudo sed -i "s|^\(.*\"port\":\).*|\1\"$COMMON_SERVICES_MSB_PORT\"|g" $file5 file6=${TOMCAT_DIR}/etc/adapterInfo/jujuadapterinfo.json - sed -i "s/^\(.*\"ip\":\).*/\1 \"$OPENO_IP\"\,/g" $file6 + sudo sed -i "s/^\(.*\"ip\":\).*/\1 \"$OPENO_IP\"\,/g" $file6 rsync -e 'ssh -o StrictHostKeyChecking=no' --rsync-path='sudo rsync' \ -av ${TOMCAT_DIR}/etc ubuntu@$juju_client_ip:/home/ubuntu/tomcat8/ rsync -e 'ssh -o StrictHostKeyChecking=no' --rsync-path='sudo rsync' \ -av ${TOMCAT_DIR}/ROOT ubuntu@$juju_client_ip:/home/ubuntu/tomcat8/webapps - docker cp ${TOMCAT_DIR}/etc nfvo-driver-vnfm-juju:/service/ - docker cp ${TOMCAT_DIR}/ROOT nfvo-driver-vnfm-juju:/service/webapps/ + sudo docker cp ${TOMCAT_DIR}/etc nfvo-driver-vnfm-juju:/service/ + sudo docker cp ${TOMCAT_DIR}/ROOT nfvo-driver-vnfm-juju:/service/webapps/ + + sudo rm -rf ${TOMCAT_DIR} } function start_tomcat() { chmod +x ${UTIL_DIR}/grant_mysql.sh - docker cp ${UTIL_DIR}/grant_mysql.sh nfvo-driver-vnfm-juju:/service - docker exec -i nfvo-driver-vnfm-juju /service/grant_mysql.sh + sudo docker cp ${UTIL_DIR}/grant_mysql.sh nfvo-driver-vnfm-juju:/service + sudo docker exec -i nfvo-driver-vnfm-juju /service/grant_mysql.sh local cmd1='sed -i s/port=\"8080\"/port=\"8483\"/g /home/ubuntu/tomcat8/conf/server.xml' exec_cmd_on_client $cmd1 @@ -76,8 +78,8 @@ function start_tomcat() exec_cmd_on_client $cmd2 - docker stop nfvo-driver-vnfm-juju - docker start nfvo-driver-vnfm-juju + sudo docker stop nfvo-driver-vnfm-juju + sudo docker start nfvo-driver-vnfm-juju sleep 10 } @@ -101,12 +103,13 @@ function deploy_vnf() function fix_openo_containers() { - docker exec gso-service-gateway sed -i "s|^\(.*\"port\":\).*|\1 \"$COMMON_SERVICES_MSB_PORT\"|g" /service/etc/conf/restclient.json - docker stop gso-service-gateway - docker start gso-service-gateway - docker exec nfvo-resmanagement sed -i "s|^\(.*\"port\":\).*|\1 \"$COMMON_SERVICES_MSB_PORT\"|g" /service/etc/conf/restclient.json - docker stop nfvo-resmanagement - docker start nfvo-resmanagement + sudo docker exec gso-service-gateway sed -i "s|^\(.*\"port\":\).*|\1 \"$COMMON_SERVICES_MSB_PORT\"|g" /service/etc/conf/restclient.json + sudo docker stop gso-service-gateway + sudo docker start gso-service-gateway + sudo docker exec nfvo-resmanagement sed -i "s|^\(.*\"port\":\).*|\1 \"$COMMON_SERVICES_MSB_PORT\"|g" /service/etc/conf/restclient.json + sudo docker stop nfvo-resmanagement + sudo docker start nfvo-resmanagement + sleep 10 } function connect_juju_and_openo() diff --git a/juju/juju_setup.sh b/juju/juju_setup.sh index eb49360..5d69c72 100755 --- a/juju/juju_setup.sh +++ b/juju/juju_setup.sh @@ -13,8 +13,8 @@ CSAR_DIR=${WORK_DIR}/csar function juju_env_prepare() { - sudo rm -f /root/.ssh/known_hosts - sudo rm -f /root/.ssh/known_hosts.old + rm -f ~/.ssh/known_hosts + rm -f ~/.ssh/known_hosts.old mkdir -p ${WORK_DIR}/venv sudo pip install --upgrade virtualenv @@ -54,12 +54,11 @@ function juju_prepare() done wget -nc -O $IMG_DIR/$JUJU_VM_IMG $JUJU_VM_IMG_URL - if [[ $(glance image-list | grep $JUJU_VM_IMG) ]]; then - openstack image delete $JUJU_VM_IMG + if [[ ! $(glance image-list | grep $JUJU_VM_IMG) ]]; then + glance image-create --name=$JUJU_VM_IMG \ + --disk-format qcow2 --container-format=bare \ + --visibility=public --file $IMG_DIR/$JUJU_VM_IMG fi - glance image-create --name=$JUJU_VM_IMG \ - --disk-format qcow2 --container-format=bare \ - --visibility=public --file $IMG_DIR/$JUJU_VM_IMG mkdir -p $CSAR_DIR for((i=0;i<${#CSAR_NAME[@]};i++)) @@ -114,10 +113,10 @@ function juju_prepare() --remote-ip-prefix 0.0.0.0/0 $default_secgroup_id fi - echo -e 'n\n'|ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa 1>/dev/null + echo -e 'n\n' | ssh-keygen -q -t rsa -N "" -f ~/.ssh/id_rsa 1>/dev/null openstack keypair delete jump-key | true - openstack keypair create --public-key /root/.ssh/id_rsa.pub jump-key + openstack keypair create --public-key ~/.ssh/id_rsa.pub jump-key openstack flavor show m1.tiny || openstack flavor create --ram 512 --disk 5 --vcpus 1 --public m1.tiny openstack flavor show m1.small || openstack flavor create --ram 1024 --disk 10 --vcpus 1 --public m1.small diff --git a/open-o/openo_docker.sh b/open-o/openo_docker.sh index b857988..ec54304 100755 --- a/open-o/openo_docker.sh +++ b/open-o/openo_docker.sh @@ -9,164 +9,164 @@ ############################################################################## function docker_pull() { - until docker pull openoint/common-services-auth:$OPENO_VERSION + until sudo docker pull openoint/common-services-auth:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/common-services-drivermanager:$OPENO_VERSION + until sudo docker pull openoint/common-services-drivermanager:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/common-services-extsys:$OPENO_VERSION + until sudo docker pull openoint/common-services-extsys:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/common-services-msb:$OPENO_VERSION + until sudo docker pull openoint/common-services-msb:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/common-services-protocolstack:$OPENO_VERSION + until sudo docker pull openoint/common-services-protocolstack:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/common-services-wso2ext:$OPENO_VERSION + until sudo docker pull openoint/common-services-wso2ext:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/common-tosca-catalog:$OPENO_VERSION + until sudo docker pull openoint/common-tosca-catalog:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/common-tosca-inventory:$OPENO_VERSION + until sudo docker pull openoint/common-tosca-inventory:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/common-tosca-modeldesigner:$OPENO_VERSION + until sudo docker pull openoint/common-tosca-modeldesigner:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/gso-service-gateway:$OPENO_VERSION + until sudo docker pull openoint/gso-service-gateway:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/gso-service-manager:$OPENO_VERSION + until sudo docker pull openoint/gso-service-manager:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/nfvo-dac:$OPENO_VERSION + until sudo docker pull openoint/nfvo-dac:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/nfvo-driver-sdnc-zte:$OPENO_VERSION + until sudo docker pull openoint/nfvo-driver-sdnc-zte:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/nfvo-driver-vim:$OPENO_VERSION + until sudo docker pull openoint/nfvo-driver-vim:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/nfvo-driver-vnfm-huawei:$OPENO_VERSION + until sudo docker pull openoint/nfvo-driver-vnfm-huawei:$OPENO_VERSION do echo "Try again" done - until docker pull huangxiangyu/nfvo-driver-vnfm-juju:$OPENO_VERSION + until sudo docker pull huangxiangyu/nfvo-driver-vnfm-juju:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/nfvo-driver-vnfm-zte:$OPENO_VERSION + until sudo docker pull openoint/nfvo-driver-vnfm-zte:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/nfvo-lcm:$OPENO_VERSION + until sudo docker pull openoint/nfvo-lcm:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/nfvo-resmanagement:$OPENO_VERSION + until sudo docker pull openoint/nfvo-resmanagement:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/nfvo-umc:$OPENO_VERSION + until sudo docker pull openoint/nfvo-umc:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/gso-gui-portal:$OPENO_VERSION + until sudo docker pull openoint/gso-gui-portal:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/common-tosca-aria:$OPENO_VERSION + until sudo docker pull openoint/common-tosca-aria:$OPENO_VERSION do echo "Try again" done if [[ $ENABLE_SDNO == true ]]; then - until docker pull openoint/sdno-driver-ct-te:$OPENO_VERSION + until sudo docker pull openoint/sdno-driver-ct-te:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-driver-huawei-l3vpn:$OPENO_VERSION + until sudo docker pull openoint/sdno-driver-huawei-l3vpn:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-driver-huawei-openstack:$OPENO_VERSION + until sudo docker pull openoint/sdno-driver-huawei-openstack:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-driver-huawei-overlay:$OPENO_VERSION + until sudo docker pull openoint/sdno-driver-huawei-overlay:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-driver-huawei-servicechain:$OPENO_VERSION + until sudo docker pull openoint/sdno-driver-huawei-servicechain:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-driver-zte-sptn:$OPENO_VERSION + until sudo docker pull openoint/sdno-driver-zte-sptn:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-brs:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-brs:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-ipsec:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-ipsec:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-l2vpn:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-l2vpn:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-l3vpn:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-l3vpn:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-mss:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-mss:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-nslcm:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-nslcm:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-overlayvpn:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-overlayvpn:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-servicechain:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-servicechain:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-vpc:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-vpc:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-service-vxlan:$OPENO_VERSION + until sudo docker pull openoint/sdno-service-vxlan:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-monitoring:$OPENO_VERSION + until sudo docker pull openoint/sdno-monitoring:$OPENO_VERSION do echo "Try again" done - until docker pull openoint/sdno-vsitemgr:$OPENO_VERSION + until sudo docker pull openoint/sdno-vsitemgr:$OPENO_VERSION do echo "Try again" done @@ -178,54 +178,54 @@ function docker_run() OPENO_VERSION=${OPENO_VERSION:-"1.0.0"} msb_ip=$OPENO_IP:$COMMON_SERVICES_MSB_PORT - docker run -d --name common-services-msb -p $OPENO_IP:$COMMON_SERVICES_MSB_PORT:80 openoint/common-services-msb:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --add-host controller:127.0.0.1 --name common-services-auth openoint/common-services-auth:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name common-services-drivermanager openoint/common-services-drivermanager:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name common-services-extsys openoint/common-services-extsys:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name common-services-protocolstack openoint/common-services-protocolstack:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name common-services-wso2ext openoint/common-services-wso2ext:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name common-tosca-catalog openoint/common-tosca-catalog:$OPENO_VERSION - tosca_inventory_id=$(docker run -d -e MSB_ADDR=$msb_ip --name common-tosca-inventory openoint/common-tosca-inventory:$OPENO_VERSION) - tosca_inventory_ip=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $tosca_inventory_id) - docker run -d -e MSB_ADDR=$msb_ip --name common-tosca-modeldesigner openoint/common-tosca-modeldesigner:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name gso-service-gateway openoint/gso-service-gateway:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip -e MYSQL_ADDR=$tosca_inventory_ip:3306 --name gso-service-manager openoint/gso-service-manager:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name nfvo-dac openoint/nfvo-dac:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-sdnc-zte openoint/nfvo-driver-sdnc-zte:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vim openoint/nfvo-driver-vim:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-huawei openoint/nfvo-driver-vnfm-huawei:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-juju -p $OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_PORT:8483 -p $OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_MYSQL_PORT:3306 huangxiangyu/nfvo-driver-vnfm-juju:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-zte openoint/nfvo-driver-vnfm-zte:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip -e MYSQL_ADDR=$tosca_inventory_ip:3306 --name nfvo-lcm -p $OPENO_IP:8403:8403 openoint/nfvo-lcm:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name nfvo-resmanagement openoint/nfvo-resmanagement:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name nfvo-umc openoint/nfvo-umc:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name common-tosca-aria -p $OPENO_IP:$COMMON_TOSCA_ARIA_PORT:8204 openoint/common-tosca-aria:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name gso-gui-portal openoint/gso-gui-portal:$OPENO_VERSION + sudo docker run -d --name common-services-msb -p $OPENO_IP:$COMMON_SERVICES_MSB_PORT:80 openoint/common-services-msb:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --add-host controller:127.0.0.1 --name common-services-auth openoint/common-services-auth:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name common-services-drivermanager openoint/common-services-drivermanager:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name common-services-extsys openoint/common-services-extsys:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name common-services-protocolstack openoint/common-services-protocolstack:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name common-services-wso2ext openoint/common-services-wso2ext:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name common-tosca-catalog openoint/common-tosca-catalog:$OPENO_VERSION + tosca_inventory_id=$(sudo docker run -d -e MSB_ADDR=$msb_ip --name common-tosca-inventory openoint/common-tosca-inventory:$OPENO_VERSION) + tosca_inventory_ip=$(sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' $tosca_inventory_id) + sudo docker run -d -e MSB_ADDR=$msb_ip --name common-tosca-modeldesigner openoint/common-tosca-modeldesigner:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name gso-service-gateway openoint/gso-service-gateway:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip -e MYSQL_ADDR=$tosca_inventory_ip:3306 --name gso-service-manager openoint/gso-service-manager:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name nfvo-dac openoint/nfvo-dac:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-sdnc-zte openoint/nfvo-driver-sdnc-zte:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vim openoint/nfvo-driver-vim:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-huawei openoint/nfvo-driver-vnfm-huawei:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-juju -p $OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_PORT:8483 -p $OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_MYSQL_PORT:3306 huangxiangyu/nfvo-driver-vnfm-juju:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-zte openoint/nfvo-driver-vnfm-zte:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip -e MYSQL_ADDR=$tosca_inventory_ip:3306 --name nfvo-lcm -p $OPENO_IP:8403:8403 openoint/nfvo-lcm:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name nfvo-resmanagement openoint/nfvo-resmanagement:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name nfvo-umc openoint/nfvo-umc:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name common-tosca-aria -p $OPENO_IP:$COMMON_TOSCA_ARIA_PORT:8204 openoint/common-tosca-aria:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name gso-gui-portal openoint/gso-gui-portal:$OPENO_VERSION if [[ $ENABLE_SDNO == true ]]; then - docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-huawei-l3vpn openoint/sdno-driver-huawei-l3vpn:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-huawei-openstack openoint/sdno-driver-huawei-openstack:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-huawei-overlay openoint/sdno-driver-huawei-overlay:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-huawei-servicechain openoint/sdno-driver-huawei-servicechain:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-zte-sptn openoint/sdno-driver-zte-sptn:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-brs openoint/sdno-service-brs:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-ipsec openoint/sdno-service-ipsec:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-l2vpn openoint/sdno-service-l2vpn:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-l3vpn openoint/sdno-service-l3vpn:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-mss openoint/sdno-service-mss:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip -e MYSQL_ADDR=$tosca_inventory_ip:3306 --name sdno-service-nslcm openoint/sdno-service-nslcm:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-overlayvpn openoint/sdno-service-overlayvpn:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-servicechain openoint/sdno-service-servicechain:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-vpc openoint/sdno-service-vpc:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-vxlan openoint/sdno-service-vxlan:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-ct-te openoint/sdno-driver-ct-te:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-monitoring openoint/sdno-monitoring:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name sdno-vsitemgr openoint/sdno-vsitemgr:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-huawei-l3vpn openoint/sdno-driver-huawei-l3vpn:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-huawei-openstack openoint/sdno-driver-huawei-openstack:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-huawei-overlay openoint/sdno-driver-huawei-overlay:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-huawei-servicechain openoint/sdno-driver-huawei-servicechain:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-zte-sptn openoint/sdno-driver-zte-sptn:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-brs openoint/sdno-service-brs:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-ipsec openoint/sdno-service-ipsec:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-l2vpn openoint/sdno-service-l2vpn:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-l3vpn openoint/sdno-service-l3vpn:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-mss openoint/sdno-service-mss:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip -e MYSQL_ADDR=$tosca_inventory_ip:3306 --name sdno-service-nslcm openoint/sdno-service-nslcm:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-overlayvpn openoint/sdno-service-overlayvpn:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-servicechain openoint/sdno-service-servicechain:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-vpc openoint/sdno-service-vpc:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-service-vxlan openoint/sdno-service-vxlan:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-driver-ct-te openoint/sdno-driver-ct-te:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-monitoring openoint/sdno-monitoring:$OPENO_VERSION + sudo docker run -d -e MSB_ADDR=$msb_ip --name sdno-vsitemgr openoint/sdno-vsitemgr:$OPENO_VERSION fi } -function clean() { - docker ps -a | grep openoint | awk '{print $1}' | xargs docker rm -f || true +function docker_clean() { + sudo docker ps -a | grep openoint | awk '{print $1}' | xargs sudo docker rm -f || true } @@ -233,7 +233,7 @@ function launch_openo() { log_info "launch_openo enter" docker_pull - clean + docker_clean docker_run echo -e "\n\033[32mOpen-O launch success\033[0m\n" diff --git a/opera_launch.sh b/opera_launch.sh index 18b0ca8..908bda9 100755 --- a/opera_launch.sh +++ b/opera_launch.sh @@ -30,7 +30,7 @@ source ${JUJU_DIR}/command.sh source ${JUJU_DIR}/juju_setup.sh source ${JUJU_DIR}/juju_launch.sh source ${JUJU_DIR}/juju_connect.sh -source ${JUJU_DIR}/vims_deploy.sh +#source ${JUJU_DIR}/vims_deploy.sh mkdir -p $WORK_DIR diff --git a/prepare.sh b/prepare.sh index 9cd8f62..a5cd5e8 100755 --- a/prepare.sh +++ b/prepare.sh @@ -28,10 +28,10 @@ function package_prepare() sudo yum install -y wget python-pip sshpass figlet curl net-tools fi sudo pip install pyyaml - docker version &>/dev/null + sudo docker version &>/dev/null if [[ $? != 0 ]];then - curl -sSL https://experimental.docker.com/ | sh - service docker start + sudo curl -sSL https://experimental.docker.com/ | sh + sudo service docker start fi } -- cgit 1.2.3-korg