X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-aux%2F80-Auxiliary-Functions%2Fbin%2Finstall;h=2526b66ac857dfb1c0ab7719fc35cf854ea288d5;hb=f127b33c7ac113cf0544f3685d9ba4b631cc2e00;hp=df15d9bec9345e7b5764e5f70b47b2b785551598;hpb=f239efe31b1139d44a87d43ab3f3a96b52faad49;p=it%2Fdep.git

diff --git a/ric-aux/80-Auxiliary-Functions/bin/install b/ric-aux/80-Auxiliary-Functions/bin/install
index df15d9be..2526b66a 100755
--- a/ric-aux/80-Auxiliary-Functions/bin/install
+++ b/ric-aux/80-Auxiliary-Functions/bin/install
@@ -23,23 +23,45 @@ OVERRIDEYAML=$1
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 
-source $DIR/../etc/dashboard.conf
+source $DIR/../etc/aux.conf
 
 if [ -z "$RICAUX_RELEASE_NAME" ];then
    RELEASE_NAME=$helm_release_name
 else
    RELEASE_NAME=$RICAUX_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
 
 RICAUX_COMPONENTS="dashboard ves message-router kong-aux"
 
 echo "Deploying RIC AUX components [$RICAUX_COMPONENTS]"
-echo "Platform Namespace: $NAMESPACE"
 echo "Helm Release Name: $RELEASE_NAME"
 
 
@@ -56,7 +78,7 @@ for component in $RICAUX_COMPONENTS; do
   if [ $component = "kong-aux" ]; then
       mkdir -p $DIR/../helm/$component/charts
       helm dep up $DIR/../helm/$component
-      helm install --namespace ricaux --name "${RELEASE_NAME}-$component" $DIR/../helm/$component --set postgresql.enabled=false --set env.database=off
+      helm install --namespace $AUX_NAMESPACE --name "${RELEASE_NAME}-$component" $DIR/../helm/$component --set postgresql.enabled=false --set env.database=off
       continue
   fi
 
@@ -65,8 +87,8 @@ for component in $RICAUX_COMPONENTS; do
   mkdir -p  $DIR/../helm/$component/charts/
   cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
   if [ -z $OVERRIDEYAML ]; then
-  helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-$component" $DIR/../helm/$component
+  helm install --namespace $AUX_NAMESPACE --name "${RELEASE_NAME}-$component" $COMMON_OVERRIDE $DIR/../helm/$component
   else
-  helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-$component" $DIR/../helm/$component
+  helm install -f $OVERRIDEYAML --namespace $AUX_NAMESPACE --name "${RELEASE_NAME}-$component" $COMMON_OVERRIDE $DIR/../helm/$component
   fi
 done