openstack
/
openstack-helm-infra
Code Issues Proposed changes

Clean-up script 

This patch set cleans up the script to be consistent with other OSH
installation scripts.

Change-Id: I212cd0cf0e818f1fc924b9b690d18f5d107b850b
Signed-off-by: Tin Lam <tin@irrational.io>
This commit is contained in:
Tin Lam 2018-10-24 21:52:04 -05:00
parent 31a9bb6ad4
commit 5730631ba6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,10 +16,12 @@
set -xe
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
: ${OSH_EXTRA_HELM_ARGS:=""}
# Install LDAP
make ldap
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
helm upgrade --install ldap ${OSH_INFRA_PATH}/ldap \
--namespace=openstack \
--set pod.replicas.server=1 \
@ -31,13 +33,9 @@ helm upgrade --install ldap ${OSH_INFRA_PATH}/ldap \
helm status ldap
# Install Keystone
cd ${OSH_PATH:-"../openstack-helm/"}
make pull-images keystone
: ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install keystone ./keystone \
helm upgrade --install keystone ${OSH_PATH}/keystone \
--namespace=openstack \
--values=./tools/overrides/keystone/ldap_domain_config.yaml \
--values=${OSH_PATH}/tools/overrides/keystone/ldap_domain_config.yaml \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_KEYSTONE}