From 1bb05c88955b5e0ad6406041ae0aaa2ef6021346 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Tue, 24 Jul 2018 10:10:08 -0400
Subject: Remove ODL restart from start script

Update image versions to 1.4-STAGING-latest

Update startODL.sh script to eliminate restart of ODL container

Change-Id: Iaef4aaea243974f97060b73c81dedce990108180
Issue-ID: SDNC-394
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 kubernetes/sdnc/charts/dmaap-listener/values.yaml  |  2 +-
 .../sdnc/charts/sdnc-ansible-server/values.yaml    |  2 +-
 kubernetes/sdnc/charts/sdnc-portal/values.yaml     |  2 +-
 kubernetes/sdnc/charts/ueb-listener/values.yaml    |  2 +-
 kubernetes/sdnc/resources/config/bin/startODL.sh   | 22 +++++++---------------
 kubernetes/sdnc/values.yaml                        |  2 +-
 6 files changed, 12 insertions(+), 20 deletions(-)

(limited to 'kubernetes')

diff --git a/kubernetes/sdnc/charts/dmaap-listener/values.yaml b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
index 27ce0f3924..9ddf590abd 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdnc-dmaap-listener-image:1.3.4
+image: onap/sdnc-dmaap-listener-image:1.4-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
index ca708937ee..895fa6ec40 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdnc-ansible-server-image:1.3.4
+image: onap/sdnc-ansible-server-image:1.4-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
index 147d391041..19385031c7 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/admportal-sdnc-image:1.3.4
+image: onap/admportal-sdnc-image:1.4-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/charts/ueb-listener/values.yaml b/kubernetes/sdnc/charts/ueb-listener/values.yaml
index d050f569d8..de9bd27291 100644
--- a/kubernetes/sdnc/charts/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdnc-ueb-listener-image:1.3.4
+image: onap/sdnc-ueb-listener-image:1.4-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh
index 86f45d3fbd..6383853c32 100755
--- a/kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/kubernetes/sdnc/resources/config/bin/startODL.sh
@@ -27,8 +27,9 @@ function enable_odl_cluster(){
   fi
 
   echo "Installing Opendaylight cluster features"
-  ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
-  ${ODL_HOME}/bin/client feature:install odl-jolokia
+  cat $ODL_HOME/etc/org.apache.karaf.features.cfg | sed -e "\|featuresBoot=config|s|$|,odl-mdsal-clustering,odl-jolokia|" > $ODL_HOME/etc/org.apache.karaf.features.cfg
+  #${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
+  #${ODL_HOME}/bin/client feature:install odl-jolokia
 
   echo "Update cluster information statically"
   hm=$(hostname)
@@ -102,13 +103,10 @@ then
         ${SDNC_HOME}/bin/installSdncDb.sh
         echo "Installing SDN-C keyStore"
         ${SDNC_HOME}/bin/addSdncKeyStore.sh
-        echo "Starting OpenDaylight"
-        ${CCSDK_HOME}/bin/installOdlHostKey.sh
-        ${ODL_HOME}/bin/start
-        echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
-        sleep ${SLEEP_TIME}
-        echo "Installing SDN-C platform features"
-        ${SDNC_HOME}/bin/installFeatures.sh
+
+	# No longer needed (this was a workaround for bug in Nitrogen)
+        #${CCSDK_HOME}/bin/installOdlHostKey.sh
+
         if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
         then
                 echo "Installing directed graphs"
@@ -117,12 +115,6 @@ then
 
         if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
 
-        echo "Restarting OpenDaylight"
-        ${ODL_HOME}/bin/stop
-
-        echo "Waiting 60 seconds for OpenDaylight stop to complete"
-        sleep 60
-
         echo "Installed at `date`" > ${SDNC_HOME}/.installed
 fi
 
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index c214d71a81..607fd05400 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -31,7 +31,7 @@ global:
 # application images
 repository: nexus3.onap.org:10001
 pullPolicy: Always
-image: onap/sdnc-image:1.3.4
+image: onap/sdnc-image:1.4-STAGING-latest
 
 # flag to enable debugging - application support required
 debugEnabled: false
-- 
cgit 1.2.3-korg