From 52f41c0af0aa91a81b105830605d23fe321b72df Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 23 Oct 2018 13:04:24 +0200 Subject: [PATCH] Define OSH_PATH by default OSH_PATH is not defined by default outside OpenStack's CI. This is a problem if a user wants to run scripts manually on its machine for local testing. This fixes it by having, by default, the OSH_PATH defined in the scripts using OSH relatively to current folder. For user experience, the script returns to the same path after running. Change-Id: I915e7d3c945f2002a2008b2b033a2b7725320b17 --- tools/deployment/keystone-auth/010-setup-client.sh | 2 +- tools/deployment/keystone-auth/070-keystone.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/deployment/keystone-auth/010-setup-client.sh b/tools/deployment/keystone-auth/010-setup-client.sh index 51cdfbd05..1a390140d 100755 --- a/tools/deployment/keystone-auth/010-setup-client.sh +++ b/tools/deployment/keystone-auth/010-setup-client.sh @@ -17,4 +17,4 @@ set -xe #NOTE: Move into openstack-helm root dir & Run client setup script -cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/020-setup-client.sh +cd ${OSH_PATH:-"../openstack-helm/"}; ./tools/deployment/developer/nfs/020-setup-client.sh; cd - diff --git a/tools/deployment/keystone-auth/070-keystone.sh b/tools/deployment/keystone-auth/070-keystone.sh index 5b57f0b8a..927fb3565 100755 --- a/tools/deployment/keystone-auth/070-keystone.sh +++ b/tools/deployment/keystone-auth/070-keystone.sh @@ -31,7 +31,7 @@ helm upgrade --install ldap ${OSH_INFRA_PATH}/ldap \ helm status ldap # Install Keystone -cd "${OSH_PATH}" +cd ${OSH_PATH:-"../openstack-helm/"} make pull-images keystone : ${OSH_EXTRA_HELM_ARGS:=""}