X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fbin%2Finstall;h=c14781a5e2e2e808e8f9ea355258933990bd54b4;hb=01adf4c86818ed16f46d8c0f9e9c691792bb233a;hp=4c97c14a456608b0d447f38e2d537de8a1c29c9c;hpb=f3d492808ef3408b811d08fb7eaf26eccf83b031;p=it%2Fdep.git

diff --git a/ric-platform/50-RIC-Platform/bin/install b/ric-platform/50-RIC-Platform/bin/install
index 4c97c14a..c14781a5 100755
--- a/ric-platform/50-RIC-Platform/bin/install
+++ b/ric-platform/50-RIC-Platform/bin/install
@@ -30,32 +30,57 @@ if [ -z "$RICPLT_RELEASE_NAME" ];then
 else
    RELEASE_NAME=$RICPLT_RELEASE_NAME
 fi
+
+# Namespace configuration
 if [ -z "$RICPLT_NAMESPACE" ];then
-   NAMESPACE=$namespace
+   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
+   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=$RICPLT_NAMESPACE
+   COMMON_OVERRIDE=$RIC_COMMON_OVERRIDE
 fi
 
 
-RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator"
+RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator submgr vespamgr"
 
 echo "Deploying RIC Platform components [$RICPLT_COMPONENTS]"
-echo "Platform Namespace: $NAMESPACE"
 echo "Helm Release Name: $RELEASE_NAME"
 
 
-COMMON_CHART_VERSION=$(cat $DIR/../helm/common/Chart.yaml | grep version | awk '{print $2}')
+COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
+
 
-helm package -d /tmp $DIR/../helm/common
+helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
 
 
 for component in $RICPLT_COMPONENTS; do
   echo "Preparing chart for comonent $component"
+
+     
   mkdir -p $DIR/../helm/$component/charts/
-  cp /tmp/common-$COMMON_CHART_VERSION.tgz $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 "${PLT_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 "${PLT_NAMESPACE}" --name "${RELEASE_NAME}-$component" $COMMON_OVERRIDE $DIR/../helm/$component
   fi
 done