Change OOM subchart deployment order

Deploy the following subcharts first:
aaf cassandra mariadb-galera dmaap

Adjust liveness and readiness probe settings
for cassandra to improve deployment speed.

Turn on 3-node clustering for appc and sdnc.

Issue-ID: INT-1055
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: I13ce1e18241bf01630bc6a2beb488633de7a2f4b

2 files changed, 19 insertions, 15 deletions

diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom.env b/deployment/heat/onap-rke/env/windriver/onap-oom.env
index 5e1a1a96b..621c34510 100644
--- a/deployment/heat/onap-rke/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-rke/env/windriver/onap-oom.env
@@ -17,7 +17,7 @@ parameters:
 
   integration_gerrit_branch: master
 
-  helm_deploy_delay: 2.5m
+  helm_deploy_delay: 3m
 
   integration_override_yaml: >
     global:
@@ -56,9 +56,9 @@ parameters:
           openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
       enabled: true
-      replicaCount: 1
+      replicaCount: 3
       config:
-        enableClustering: false
+        enableClustering: true
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
         openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
@@ -68,9 +68,9 @@ parameters:
         openStackEncryptedPassword: "${OS_PASSWORD}"
     sdnc:
       enabled: true
-      replicaCount: 1
+      replicaCount: 3
       config:
-        enableClustering: false
+        enableClustering: true
     aai:
       enabled: true
       liveness:
@@ -87,16 +87,16 @@ parameters:
       aai-cassandra:
         replicaCount: 3
         liveness:
-          periodSeconds: 600
+          periodSeconds: 120
         readiness:
-          periodSeconds: 600
+          periodSeconds: 60
     portal:
       enabled: true
       portal-cassandra:
         liveness:
-          periodSeconds: 600
+          periodSeconds: 120
         readiness:
-          periodSeconds: 600
+          periodSeconds: 60
     vid:
       enabled: true
     aaf:
@@ -104,9 +104,9 @@ parameters:
     cassandra:
       enabled: true
       liveness:
-        periodSeconds: 600
+        periodSeconds: 120
       readiness:
-        periodSeconds: 600
+        periodSeconds: 60
     clamp:
       enabled: true
     cli:
@@ -134,13 +134,16 @@ parameters:
           music-cassandra:
             replicaCount: 3
             liveness:
-              periodSeconds: 600
+              periodSeconds: 120
             readiness:
-              periodSeconds: 600
+              periodSeconds: 60
           music-tomcat:
             replicaCount: 1
     mariadb-galera:
       enabled: true
+      liveness:
+        initialDelaySeconds: 120
+        periodSeconds: 60
     modeling:
       enabled: true
     msb:
@@ -157,9 +160,9 @@ parameters:
       enabled: true
       sdc-cs:
         liveness:
-          periodSeconds: 600
+          periodSeconds: 120
         readiness:
-          periodSeconds: 600
+          periodSeconds: 60
     uui:
       enabled: true
     vfc:
diff --git a/deployment/heat/onap-rke/rancher_vm_entrypoint.sh b/deployment/heat/onap-rke/rancher_vm_entrypoint.sh
index 65c16dace..47cd01230 100644
--- a/deployment/heat/onap-rke/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-rke/rancher_vm_entrypoint.sh
@@ -221,6 +221,7 @@ rsync -avt ~/oom/kubernetes/helm/plugins ~/.helm/
 # temporary workaround to throttle the helm deploy to alleviate startup disk contention issues
 if [ ! -z "__helm_deploy_delay__" ]; then
     sed -i "/\^enabled:/a\      echo sleep __helm_deploy_delay__\n      sleep __helm_deploy_delay__" ~/.helm/plugins/deploy/deploy.sh
+    sed -i 's/for subchart in \*/for subchart in aaf cassandra mariadb-galera dmaap */' ~/.helm/plugins/deploy/deploy.sh
 fi
 
 # Deploy ONAP