From ff1f75fc450137a53139896a0c9c4272bc831b79 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Mon, 5 Nov 2018 14:30:41 +0100
Subject: [PATCH] Do not use OSH_INFRA_PATH in osh-infra
If OSH_INFRA_PATH is never used in the openstack-helm-infra repository,
as all the references are using relative paths.
The keystone script is not using a relative path, and relies on
OSH_INFRA_PATH to be defined to work.
This is a problem, because when it is not defined, the expected path
for ldap chart is /ldap, which is an incorrect path.
This fixes the problem by ensuring the path is relative.
Change-Id: I04a8d5c074b7c1e6fa66617bbb907f2ad4dcb3af
---
tools/deployment/keystone-auth/070-keystone.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/deployment/keystone-auth/070-keystone.sh b/tools/deployment/keystone-auth/070-keystone.sh
index d71910edd..35066a727 100755
--- a/tools/deployment/keystone-auth/070-keystone.sh
+++ b/tools/deployment/keystone-auth/070-keystone.sh
@@ -22,7 +22,7 @@ set -xe
# Install LDAP
make ldap
-helm upgrade --install ldap ${OSH_INFRA_PATH}/ldap \
+helm upgrade --install ldap ./ldap \
--namespace=openstack \
--set pod.replicas.server=1 \
--set bootstrap.enabled=true \