aboutsummaryrefslogtreecommitdiffstats
path: root/juju
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-03-27 11:53:39 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2017-03-27 14:11:21 +0800
commit7ee5c95db62d13d860d51974aa9c0a14404cee56 (patch)
tree8b8c36e9fef50ace481694cd1933566048755a6d /juju
parent654e20848b723541c17d56cf16518db87e14f7ae (diff)
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 <huangxiangyu5@huawei.com>
Diffstat (limited to 'juju')
-rwxr-xr-xjuju/juju_connect.sh55
-rwxr-xr-xjuju/juju_setup.sh17
2 files changed, 37 insertions, 35 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