diff options
Diffstat (limited to 'juju')
| -rwxr-xr-x | juju/juju_connect.sh | 10 | ||||
| -rwxr-xr-x | juju/juju_launch.sh | 17 |
2 files changed, 21 insertions, 6 deletions
diff --git a/juju/juju_connect.sh b/juju/juju_connect.sh index 7ff803e..693918e 100755 --- a/juju/juju_connect.sh +++ b/juju/juju_connect.sh @@ -60,11 +60,11 @@ function sync_juju_driver_file() function start_tomcat() { - local cmd1="mysql -uroot -p'rootpass' << EOF - GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'rootpass' WITH GRANT OPTION; - FLUSH PRIVILEGES; - EOF" - exec_cmd_on_client $cmd1 + scp_to_openo ${UTIL_DIR}/grant_mysql.sh /home + local cmd1="chmod +x /home/grant_mysql.sh; \ + docker cp /home/grant_mysql.sh nfvo-driver-vnfm-juju:/service; \ + docker exec -i nfvo-driver-vnfm-juju /service/grant_mysql.sh" + exec_cmd_on_openo $cmd1 local cmd2='sed -i s/port=\"8080\"/port=\"8483\"/g /home/ubuntu/tomcat8/conf/server.xml' exec_cmd_on_client $cmd2 diff --git a/juju/juju_launch.sh b/juju/juju_launch.sh index 3653660..1ad6e89 100755 --- a/juju/juju_launch.sh +++ b/juju/juju_launch.sh @@ -59,7 +59,22 @@ function launch_juju_vm() floating_ip_metadata=$(nova list | grep juju-metadata-vm | awk '{print $13}') fi - sleep 60 + local wait=120 + set +x + while + if [[ $wait == 0 ]]; then + log_error "launch juju vm can't access" + exit 1 + fi + exec_cmd_on_client exit + local ready1=$? + exec_cmd_on_metadata exit + local ready2=$? + let wait-=1 + sleep 2 + [[ $ready1 != 0 || $ready2 != 0 ]] + do :;done + set -x export floating_ip_client=$floating_ip_client export floating_ip_metadata=$floating_ip_metadata |