summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDustin Specker <dustin.specker@att.com>2019-02-22 10:48:10 -0600
committerKaspars Skels <kaspars.skels@gmail.com>2019-02-28 00:11:32 +0000
commitf4f57a1bbf3cc9ca6c868a11cc8923326c81b6dc (patch)
treefdfd05fd90c6c47ab5edc1adaedf88c38145031e
parent2d10945dd853fda07cdd325a275efd66640a39b4 (diff)
tools: fix execute_shipyard_action if condition
Before if condition was looking for non-existence of ${server}. `server` is never defined, so this condition is always true. Now if condition is looking for existence of ${servers}, which is sometimes defined. Change-Id: I31cd4a2765705176a9d5239a01b04ff341b36540
Notes
Notes (review): Code-Review+1: Alexander Hughes <Alexander.Hughes@pm.me> Code-Review+1: Evgeniy L <eli@mirantis.com> Code-Review+1: Nishant Kumar <nishant.e.kumar@ericsson.com> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+2: Roman Gorshunov <roman.gorshunov@att.com> Workflow+1: Roman Gorshunov <roman.gorshunov@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 28 Feb 2019 07:45:51 +0000 Reviewed-on: https://review.openstack.org/638717 Project: openstack/airship-shipyard Branch: refs/heads/master
-rwxr-xr-xtools/execute_shipyard_action.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/execute_shipyard_action.sh b/tools/execute_shipyard_action.sh
index 6ad4db0..024fb24 100755
--- a/tools/execute_shipyard_action.sh
+++ b/tools/execute_shipyard_action.sh
@@ -50,7 +50,7 @@ run_action () {
50 # Note that deploy and update site do not require additional parameter 50 # Note that deploy and update site do not require additional parameter
51 # to be passed in while redeploy_server requires user to indicate which 51 # to be passed in while redeploy_server requires user to indicate which
52 # servers to redeploy 52 # servers to redeploy
53 if ! [[ ${server} ]] && [[ ${action} ]]; then 53 if ! [[ ${servers} ]] && [[ ${action} ]]; then
54 ${base_docker_command} ${SHIPYARD_IMAGE} create action ${action} 54 ${base_docker_command} ${SHIPYARD_IMAGE} create action ${action}
55 elif [[ ${action} == 'redeploy_server' && ${servers} ]]; then 55 elif [[ ${action} == 'redeploy_server' && ${servers} ]]; then
56 ${base_docker_command} ${SHIPYARD_IMAGE} create action redeploy_server --param="target_nodes=${servers}" 56 ${base_docker_command} ${SHIPYARD_IMAGE} create action redeploy_server --param="target_nodes=${servers}"