From 1953f869ad6212b323aeeae09df4dbb25ca7a377 Mon Sep 17 00:00:00 2001
From: astebenkova <astebenkova@mirantis.com>
Date: Mon, 11 Mar 2024 17:21:04 +0200
Subject: [PATCH] Include values_overrides for OpenStack components

Fixes issue where override files for OS charts were
missing due to specifying the wrong project directory.

Change-Id: I4af6715a33c7de43068ed76a8115c12a2c0969ed
---
 tools/deployment/keystone-auth/070-keystone.sh            | 2 +-
 tools/deployment/mariadb-operator-cluster/070-keystone.sh | 2 +-
 tools/deployment/openstack-support-rook/130-cinder.sh     | 2 +-
 tools/deployment/openstack-support/130-cinder.sh          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/deployment/keystone-auth/070-keystone.sh b/tools/deployment/keystone-auth/070-keystone.sh
index 99e86b240..199f51376 100755
--- a/tools/deployment/keystone-auth/070-keystone.sh
+++ b/tools/deployment/keystone-auth/070-keystone.sh
@@ -17,7 +17,7 @@ set -xe
 : ${OSH_PATH:="../openstack-helm"}
 : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
 : ${OSH_EXTRA_HELM_ARGS:=""}
-: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone)"}
+: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(HELM_CHART_ROOT_PATH=${OSH_PATH} ./tools/deployment/common/get-values-overrides.sh keystone)"}
 
 # Install LDAP
 make ldap
diff --git a/tools/deployment/mariadb-operator-cluster/070-keystone.sh b/tools/deployment/mariadb-operator-cluster/070-keystone.sh
index 39f4c6227..ceefa831e 100755
--- a/tools/deployment/mariadb-operator-cluster/070-keystone.sh
+++ b/tools/deployment/mariadb-operator-cluster/070-keystone.sh
@@ -17,7 +17,7 @@ set -xe
 : ${OSH_PATH:="../openstack-helm"}
 : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
 : ${OSH_EXTRA_HELM_ARGS:=""}
-: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone)"}
+: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(HELM_CHART_ROOT_PATH=${OSH_PATH} ./tools/deployment/common/get-values-overrides.sh keystone)"}
 
 # Install LDAP
 make ldap
diff --git a/tools/deployment/openstack-support-rook/130-cinder.sh b/tools/deployment/openstack-support-rook/130-cinder.sh
index 7fdeffa6d..8d9602e5c 100755
--- a/tools/deployment/openstack-support-rook/130-cinder.sh
+++ b/tools/deployment/openstack-support-rook/130-cinder.sh
@@ -18,7 +18,7 @@ set -xe
 : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 #NOTE: Get the over-rides to use
-: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(./tools/deployment/common/get-values-overrides.sh cinder)"}
+: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(HELM_CHART_ROOT_PATH=${OSH_PATH} ./tools/deployment/common/get-values-overrides.sh cinder)"}
 
 #NOTE: Lint and package chart
 cd ${OSH_PATH}
diff --git a/tools/deployment/openstack-support/130-cinder.sh b/tools/deployment/openstack-support/130-cinder.sh
index 7cf2d8d62..ebf692e0d 100755
--- a/tools/deployment/openstack-support/130-cinder.sh
+++ b/tools/deployment/openstack-support/130-cinder.sh
@@ -18,7 +18,7 @@ set -xe
 : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 #NOTE: Get the over-rides to use
-: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(./tools/deployment/common/get-values-overrides.sh cinder)"}
+: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(HELM_CHART_ROOT_PATH=${OSH_PATH} ./tools/deployment/common/get-values-overrides.sh cinder)"}
 
 #NOTE: Lint and package chart
 cd ${OSH_PATH}