From e68e3142d1e247d8061f750c3da3ddbf4e51d630 Mon Sep 17 00:00:00 2001
From: wrider <lji@research.att.com>
Date: Tue, 28 Jan 2020 13:08:47 -0500
Subject: [PATCH] Add DBaaS HA related deployment

Change-Id: Iae2bac6cbfae50b3253285ad7121460af9d42027
Signed-off-by: wrider <lji@research.att.com>
Issue-ID: RIC-185
---
 RECIPE_EXAMPLE/example_recipe.yaml | 11 ++++++++++-
 bin/install                        |  5 +++--
 bin/uninstall                      |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/RECIPE_EXAMPLE/example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml
index e181e00..4cdd4f3 100644
--- a/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/RECIPE_EXAMPLE/example_recipe.yaml
@@ -84,7 +84,16 @@ dbaas:
     image:
       registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
       name: ric-plt-dbaas
-      tag: 0.2.2
+      tag: 0.1.0
+
+dbaasha:
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-plt-dbaas
+    tag: 0.2.2
+  # Remove the affinity line below when deploying in a k8s
+  # cluster of more than 3 nodes.
+  affinity: ""
 
 e2mgr:
   image:
diff --git a/bin/install b/bin/install
index 5c7837d..e4e526b 100755
--- a/bin/install
+++ b/bin/install
@@ -70,7 +70,8 @@ PLTNAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *platform:/{print $2}')
 INFRANAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *infra:/{print $2}')
 XAPPNAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *xapp:/{print $2}')
 RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"infrastructure appmgr rtmgr dbaas1 e2mgr e2term a1mediator submgr vespamgr rsm jaegeradapter"}
+# replace the dbaasha with dbaas1 if deploying non HA DBaaS
+COMPONENTS=${LIST_OF_COMPONENTS:-"infrastructure appmgr rtmgr dbaasha e2mgr e2term a1mediator submgr vespamgr rsm jaegeradapter"}
 echo "Deploying RIC infra components [$COMPONENTS]"
 
 
@@ -91,4 +92,4 @@ for component in $COMPONENTS; do
     helm dep up $DIR/../helm/$component
     helm install -f $OVERRIDEYAML --namespace "${PLTNAMESPACE:-ricplt}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
     sleep 3
-done
+done
\ No newline at end of file
diff --git a/bin/uninstall b/bin/uninstall
index dd7e869..0d304f1 100755
--- a/bin/uninstall
+++ b/bin/uninstall
@@ -16,7 +16,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-COMPONENTS="appmgr rtmgr dbaas1 e2mgr e2term a1mediator submgr vespamgr rsm jaegeradapter infrastructure"
+COMPONENTS="appmgr rtmgr dbaas1 dbaasha e2mgr e2term a1mediator submgr vespamgr rsm jaegeradapter infrastructure"
 RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep ricplt-recipe | awk '{print $1}')
 kubectl get configmap  -n $RECIPE_NAMESPACE ricplt-recipe  -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
 
-- 
2.16.6