openstack
/
openstack-helm-infra
Code Issues Proposed changes

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
This commit is contained in:
Jean-Philippe Evrard 2018-10-23 13:04:24 +02:00 committed by Chris Wedgwood
parent 4835aa637a
commit 52f41c0af0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/deployment/keystone-auth/010-setup-client.sh
View File

@ -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 -

2
tools/deployment/keystone-auth/070-keystone.sh
View File

@ -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:=""}