ONAP OOM chart version upgraded

ONAP OOM version upgraded to latest master.
Warning added related to previous volume data.
ACM credentials updated in rappmanager and dmeparticipant.

Issue-ID: NONRTRIC-1020
Change-Id: I11829f462db62c164de3a1bc4254a60799d8ba89
Signed-off-by: aravind.est <aravindhan.a@est.tech>

diff --git a/smo-install/onap_oom b/smo-install/onap_oom
index bfb1e3c..1507ea7 160000 (submodule)
--- a/smo-install/onap_oom
+++ b/smo-install/onap_oom
@@ -1 +1 @@
-Subproject commit bfb1e3ca7140e0f16ac05811f1fcbdfdc992de17
+Subproject commit 1507ea7ec3bc90ba859acfc6ac22fd23c443e14b

diff --git a/smo-install/oran_oom/dmeparticipant/values.yaml b/smo-install/oran_oom/dmeparticipant/values.yaml
index 58f710f..f001612 100644 (file)
--- a/smo-install/oran_oom/dmeparticipant/values.yaml
+++ b/smo-install/oran_oom/dmeparticipant/values.yaml
@@ -39,8 +39,8 @@ readiness:
 ingress:
   enabled: false
 security:
-  username: cGFydGljaXBhbnRVc2VyCg==
-  password: emIhWHp0RzM0
+  username: cnVudGltZVVzZXI=
+  password: Wmlib1RpcGRaZXl0OV0=
 
 componentName: &componentName dmeparticipant
 

diff --git a/smo-install/oran_oom/rappmanager/values.yaml b/smo-install/oran_oom/rappmanager/values.yaml
index fc7fc19..07822f8 100644 (file)
--- a/smo-install/oran_oom/rappmanager/values.yaml
+++ b/smo-install/oran_oom/rappmanager/values.yaml
@@ -46,7 +46,7 @@ ingress:
 rappmanager:
   acm:
     username: cnVudGltZVVzZXI=
-    password: emIhWHp0RzM0
+    password: Wmlib1RpcGRaZXl0OV0=
 
 application:
   rappmanager:

diff --git a/smo-install/scripts/sub-scripts/install-onap.sh b/smo-install/scripts/sub-scripts/install-onap.sh
index 0253291..357b600 100755 (executable)
--- a/smo-install/scripts/sub-scripts/install-onap.sh
+++ b/smo-install/scripts/sub-scripts/install-onap.sh
@@ -40,7 +40,7 @@ if [ "$MODE" == "dev" ]; then
 
     kubectl create namespace onap
     echo '### Installing ONAP part (Dev Mode) ###'
-    helm deploy --debug onap local/onap --namespace onap -f $1 --set global.persistence.mountPath="/dockerdata-nfs/deployment-$3" --set dmaap.message-router.message-router-zookeeper.persistence.mountPath="/dockerdata-nfs/deployment-$3" --set dmaap.message-router.message-router-kafka.persistence.mountPath="/dockerdata-nfs/deployment-$3"
+    helm deploy --debug onap local/onap --namespace onap -f $1
 else
     echo "### Installing Strimzi Kafka Operator (Release Mode) ###"
     helm repo add strimzi https://strimzi.io/charts/

diff --git a/smo-install/scripts/sub-scripts/preconfigure-smo.sh b/smo-install/scripts/sub-scripts/preconfigure-smo.sh
index b94615c..290df43 100755 (executable)
--- a/smo-install/scripts/sub-scripts/preconfigure-smo.sh
+++ b/smo-install/scripts/sub-scripts/preconfigure-smo.sh
@@ -25,6 +25,10 @@ if [ $(kubectl get nodes --no-headers | wc -l) -gt 1 ]; then
     echo "-------------------------------------------------------------------------------------------"
     echo "This installation uses /dockerdata-nfs as a volume mount point."
     echo "Each application creates its own sub-directory under /dockerdata-nfs."
+    echo "-------------------------------------------------------------------------------------------"
+    echo "If there is any previous installation, please ensure that the /dockerdata-nfs directory is empty."
+    echo "Leaving any previous data in this directory may cause issues with the new installation."
+    echo "-------------------------------------------------------------------------------------------"
     echo "The file permission of the sub-directory should be set to 777. "
     echo "Setting the permission to 777 is required for the application to work properly."
     echo "Hence, the following command should be run on all nodes in the cluster."
@@ -39,6 +43,13 @@ if [ $(kubectl get nodes --no-headers | wc -l) -gt 1 ]; then
     echo "sudo mkdir -p /dockerdata-nfs/onap/strimzi-kafka/broker-0"
     echo "sudo chmod -R 777 /dockerdata-nfs"
     echo "-------------------------------------------------------------------------------------------"
+else
+    echo "This is a single-node cluster."
+    echo "The installation will proceed with the assumption that /dockerdata-nfs is available on this node."
+    echo "------------------------------------- WARNING!!! -------------------------------------------"
+    echo "If there is any previous installation, please ensure that the /dockerdata-nfs directory is empty."
+    echo "Leaving any previous data in this directory may cause issues with the new installation."
+    echo "-------------------------------------------------------------------------------------------"
 fi
 
 # This needs to be done on all nodes in case of multi-node setup