diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2018-01-22 08:06:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-22 08:06:29 +0000 |
| commit | 24e25de8fc981e3b33ffaa71e76f27dedcf6b89e (patch) | |
| tree | c8b6970841f832ec2c543302a788b607cd70c208 /deploy/launch.sh | |
| parent | 057c5a072639c1feb1a7aa6312e9b6c309ea2f8b (diff) | |
| parent | 4956657410d57861f9157167a291aefc437d9218 (diff) | |
Merge "Support multi-cluster deploy"
Diffstat (limited to 'deploy/launch.sh')
| -rwxr-xr-x | deploy/launch.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/deploy/launch.sh b/deploy/launch.sh index 6cbad1fa..98d9e4d6 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -55,7 +55,8 @@ if [[ "$EXPANSION" == "false" ]]; then export machines - if [[ "$DEPLOY_COMPASS" == "true" ]]; then + CONTAINER_ALIVE=$(check_container_alive) + if [[ "$DEPLOY_COMPASS" == "true" && "$CONTAINER_ALIVE" == "false" ]]; then if ! prepare_env;then echo "prepare_env failed" exit 1 @@ -71,7 +72,7 @@ if [[ "$EXPANSION" == "false" ]]; then log_error "launch_compass failed" exit 1 fi - else + elif [[ "$DEPLOY_COMPASS" == "true" && "$CONTAINER_ALIVE" == "true" ]]; then refresh_compass_core fi else |