diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2018-03-13 01:43:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-13 01:43:06 +0000 |
| commit | 93cd2cd6f456bc95ceda1f4817fffa88feb74129 (patch) | |
| tree | 965582c70ea4be18ebe6df5b77b32a9a9f021817 | |
| parent | 6bc387014a355483900cd5542961096e8b307cf4 (diff) | |
| parent | 1ab8dd1113931331c74177d31a5e6fc10ce8809d (diff) | |
Merge "Modify deploy variable"
| -rwxr-xr-x | deploy/launch.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/deploy/launch.sh b/deploy/launch.sh index 2b32c337..76e8f254 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -56,7 +56,10 @@ if [[ "$EXPANSION" == "false" ]]; then export machines CONTAINER_ALIVE=$(check_container_alive) - if [[ "$DEPLOY_COMPASS" == "true" && "$CONTAINER_ALIVE" == "false" ]]; then + if + [[ "$DEPLOY_FIRST_TIME" == "true" ]] || + [[ "$DEPLOY_COMPASS" == "true" && "$CONTAINER_ALIVE" == "false" ]] + then if ! prepare_env;then echo "prepare_env failed" exit 1 @@ -72,7 +75,9 @@ if [[ "$EXPANSION" == "false" ]]; then log_error "launch_compass failed" exit 1 fi - elif [[ "$DEPLOY_COMPASS" == "true" && "$CONTAINER_ALIVE" == "true" ]]; then + elif + [[ "$DEPLOY_COMPASS" == "true" && "$CONTAINER_ALIVE" == "true" ]] + then refresh_compass_core fi else |