further improve script helpers

1 files changed, 4 insertions, 5 deletions

diff --git a/upgrade.sh b/upgrade.sh
index e44379c5..49e1b6f2 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -7,11 +7,10 @@ fi
 hosts="$1"
 shift
 
-source "${BASH_SOURCE%/*}/common/utils.sh"
-get_ansible_variable env_group "$hosts"
-if [ $? -ne 0 ]; then
-  exit 1
-fi
+cd "${BASH_SOURCE%/*}"
+source common/utils.sh
+ansible_variable__get env_group "$hosts" || exit 1
+vault_environment__set "$env_group" || exit 1
 
 echo "######## upgrading host(s) '$hosts' in environment '$env_group' ########"
 exec ansible-playbook -e "myhosts=$hosts" -e "myrole=upgrade" $@ "$env_group/generic.yaml"