diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-03-01 12:49:09 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-03-01 14:35:26 +0800 |
| commit | bd9c1aff4191019efe05cd0fabbade624bb2229d (patch) | |
| tree | 80bd6d9f4905ae9b04ec8ed6a7ee43e8577fe8b9 /juju/juju_connect.sh | |
| parent | 51451b626187ae1b6db3015174792fadc3428968 (diff) | |
juju connect fix
use argparse to explicitly pass args
Change-Id: Id729d6897be6511c8bd2de8aa31cf37dfada1caf
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'juju/juju_connect.sh')
| -rwxr-xr-x | juju/juju_connect.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/juju/juju_connect.sh b/juju/juju_connect.sh index 0bc4ef9..2bc742b 100755 --- a/juju/juju_connect.sh +++ b/juju/juju_connect.sh @@ -64,15 +64,20 @@ function start_tomcat() FLUSH PRIVILEGES; EOF" - local cmd2="sed -i s/port=\"8080\"/port=\"8483\"/ /home/ubuntu/tomcat8/conf/server.xml; \ - ps aux | grep java | awk '{print \"$2\"}' | xargs kill -9; \ - /home/ubuntu/tomcat8/bin/catalina.sh start" + local cmd2='sed -i s/port=\"8080\"/port=\"8483\"/g /home/ubuntu/tomcat8/conf/server.xml' exec_cmd_on_client $cmd2 + + local cmd3="ps aux | grep java | awk '{print \"$2\"}' | xargs kill -9; \ + /home/ubuntu/tomcat8/bin/catalina.sh start" + exec_cmd_on_client $cmd3 } function add_vim_and_vnfm() { - python ${JUJU_DIR}/openo_connect.py $COMMON_SERVICES_MSB_IP $NFVO_DRIVER_VNFM_JUJU_IP + python ${JUJU_DIR}/openo_connect.py --msb_ip $COMMON_SERVICES_MSB_IP \ + --tosca_aria_ip $COMMON_TOSCA_ARIA_IP \ + --juju_client_ip $floating_ip_client \ + --auth_url $OS_AUTH_URL local cmd3="docker stop nfvo-driver-vnfm-juju; \ docker start nfvo-driver-vnfm-juju" |