diff options
Diffstat (limited to 'juju')
| -rwxr-xr-x | juju/juju_connect.sh | 3 | ||||
| -rwxr-xr-x | juju/juju_launch.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/juju/juju_connect.sh b/juju/juju_connect.sh index e4a94db..06191e3 100755 --- a/juju/juju_connect.sh +++ b/juju/juju_connect.sh @@ -78,6 +78,7 @@ function start_tomcat() docker stop nfvo-driver-vnfm-juju docker start nfvo-driver-vnfm-juju + sleep 10 } function openo_connect() @@ -114,6 +115,6 @@ function connect_juju_and_openo() sync_juju_driver_file start_tomcat -# fix_openo_containers + fix_openo_containers openo_connect } diff --git a/juju/juju_launch.sh b/juju/juju_launch.sh index 766ebfe..501a48a 100755 --- a/juju/juju_launch.sh +++ b/juju/juju_launch.sh @@ -91,6 +91,9 @@ function juju_client_prepare() exec_cmd_on_client $cmd2 scp_to_client ${CONF_DIR}/admin-openrc.sh /home/ubuntu + + local cmd4="cd /home/ubuntu/juju_server; git reset --hard; git pull;" + exec_cmd_on_client $cmd4 } function juju_generate_metadata() |