From 750bb939d963bb0a70df8dfc52bc886112739a8f Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <andrii.ostapenko@att.com>
Date: Mon, 18 May 2020 18:07:57 -0500
Subject: [PATCH] Add proper chart path for ingress deployment script
Change-Id: I79058dc00764494d6ea37d430529b1c06b49434f
---
tools/deployment/apparmor/015-ingress.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/deployment/apparmor/015-ingress.sh b/tools/deployment/apparmor/015-ingress.sh
index 300b12cbc5..34b82504c9 100755
--- a/tools/deployment/apparmor/015-ingress.sh
+++ b/tools/deployment/apparmor/015-ingress.sh
@@ -19,6 +19,8 @@ set -xe
#NOTE: Lint and package chart
make ingress
+export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+
: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_SYSTEM:="$(./tools/deployment/common/get-values-overrides.sh ingress)"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_OPENSTACK:="$(./tools/deployment/common/get-values-overrides.sh ingress)"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH:="$(./tools/deployment/common/get-values-overrides.sh ingress)"}
@@ -34,7 +36,7 @@ deployment:
network:
host_namespace: true
EOF
-helm upgrade --install ingress-kube-system ./ingress \
+helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=kube-system \
--values=/tmp/ingress-kube-system.yaml \
${OSH_INFRA_EXTRA_HELM_ARGS} \
@@ -47,7 +49,7 @@ helm upgrade --install ingress-kube-system ./ingress \
helm status ingress-kube-system
#NOTE: Deploy namespace ingress
-helm upgrade --install ingress-osh-infra ./ingress \
+helm upgrade --install ingress-osh-infra ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=osh-infra \
${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
@@ -58,7 +60,7 @@ helm upgrade --install ingress-osh-infra ./ingress \
#NOTE: Display info
helm status ingress-osh-infra
-helm upgrade --install ingress-ceph ./ingress \
+helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=ceph \
${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_CEPH}