diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-03-25 08:47:03 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-03-25 12:42:44 +0800 |
| commit | 654e20848b723541c17d56cf16518db87e14f7ae (patch) | |
| tree | b0892069dee8c841362d1f65dd0f04045fdc0ae4 | |
| parent | a6346420a0e0d2f4564d8ecc030146cae098a7f4 (diff) | |
Updated Ellis configuration
1. Fix the Ellis port inaccessible issue
2. Force to pull the latest juju server code
Change-Id: I8b36271e37e19d3ebab03a9808f11d210f975d59
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
| -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() |