X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-infra%2F20-Monitoring%2Fbin%2Finstall;h=58274bfdbff2e4965446a71e3a968f8f71784a3d;hb=96f1edd267659d09822b64fffa16077e28fcec0b;hp=b7d0c6f1a9050dea57ca18534e948ff33efed6e5;hpb=e01667fb0798c859ec9eeaba88bfb13951efe5f2;p=it%2Fdep.git

diff --git a/ric-infra/20-Monitoring/bin/install b/ric-infra/20-Monitoring/bin/install
index b7d0c6f1..58274bfd 100755
--- a/ric-infra/20-Monitoring/bin/install
+++ b/ric-infra/20-Monitoring/bin/install
@@ -24,23 +24,44 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 source $DIR/../etc/elfkp.conf
 
-if [ -z "$RICAUX_RELEASE_NAME" ];then
+if [ -z "$RICINFRA_RELEASE_NAME" ];then
    RELEASE_NAME=$helm_release_name
 else
-   RELEASE_NAME=$RICAUX_RELEASE_NAME
+   RELEASE_NAME=$RICINFRA_RELEASE_NAME
+fi
+# Namespace configuration
+if [ -z "$RICPLT_NAMESPACE" ];then
+   PLT_NAMESPACE=$plt_namespace
+else
+   PLT_NAMESPACE=$RICPLT_NAMESPACE
+fi
+if [ -z "$RICXAPP_NAMESPACE" ];then
+   XAPP_NAMESPACE=$xapp_namespace
+else
+   XAPP_NAMESPACE=$RICXAPP_NAMESPACE
 fi
 if [ -z "$RICAUX_NAMESPACE" ];then
-   NAMESPACE=$namespace
+   AUX_NAMESPACE=$aux_namespace
+else
+   AUX_NAMESPACE=$RICAUX_NAMESPACE
+fi
+if [ -z "$RICINFRA_NAMESPACE" ];then
+   INFRA_NAMESPACE=$infra_namespace
+else
+   INFRA_NAMESPACE=$RICINFRA_NAMESPACE
+fi
+
+if [ -z "$RIC_COMMON_OVERRIDE" ];then
+   COMMON_OVERRIDE="--set global.namespace.platform=$PLT_NAMESPACE --set global.namespace.xapp=$XAPP_NAMESPACE --set global.namespace.aux=$AUX_NAMESPACE --set global.namespace.infra=$INFRA_NAMESPACE"
 else
-   NAMESPACE=$RICAUX_NAMESPACE
+   COMMON_OVERRIDE=$RIC_COMMON_OVERRIDE
 fi
 
 #helm install --name my-release stable/elastic-stack --set elasticsearch.data.persistence.enabled=false --set elasticsearch.master.persistence.enabled=false --set logstash.persistence.enabled=false 
 
 RICAUX_COMPONENTS="elfkp"
 
-echo "Deploying RIC AUX components [$RICAUX_COMPONENTS]"
-echo "Platform Namespace: $NAMESPACE"
+echo "Deploying RIC infra components [$RICAUX_COMPONENTS]"
 echo "Helm Release Name: $RELEASE_NAME"
 
 
@@ -62,8 +83,8 @@ for component in $RICAUX_COMPONENTS; do
   #eval "$CMD"
 
   if [ -z $OVERRIDEYAML ]; then
-    helm install --debug --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-$component" $component
+    helm install --debug --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-$component" $COMMON_OVERRIDE $DIR/../helm/$component
   else
-    helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-$component" $component
+    helm install -f $OVERRIDEYAML --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-$component" $COMMON_OVERRIDE $DIR/../helm/$component
   fi
 done