X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fresources%2Fconfig%2Fbin%2FstartODL.sh;h=45b74aaa2068a4dc2dd7620b59b73a8c761245d4;hb=b76cb2810fc083b6151652083a416989680f17e7;hp=288ce11b8b0bd42871221647b76cca56612152d6;hpb=126822ffc4ab3de82450fb0db574a38cb8be41b3;p=oom.git

diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh
index 288ce11b8b..45b74aaa20 100755
--- a/kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/kubernetes/sdnc/resources/config/bin/startODL.sh
@@ -27,8 +27,10 @@ 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
+  mv $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
+  cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | 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)
@@ -38,18 +40,14 @@ function enable_odl_cluster(){
   node_index=($(echo ${hm} | awk -F"-" '{print $NF}'))
   member_offset=1
 
-  if [ -z $PEER_ODL_CLUSTER ]; then
-    echo "This is a local cluster"
-    node_list="${node}-0.{{.Values.service.name}}-cluster.{{.Release.Namespace}}";
-
-    for ((i=1;i<${SDNC_REPLICAS};i++));
-    do
-      node_list="${node_list} ${node}-$i.{{.Values.service.name}}-cluster.{{.Release.Namespace}}"
-    done
-    /opt/opendaylight/current/bin/configure_cluster.sh $((node_index+1)) ${node_list}
-  else
+  if $GEO_ENABLED; then
     echo "This is a Geo cluster"
 
+    if [ -z $IS_PRIMARY_CLUSTER ] || [ -z $MY_ODL_CLUSTER ] || [ -z $PEER_ODL_CLUSTER ]; then
+     echo "IS_PRIMARY_CLUSTER, MY_ODL_CLUSTER and PEER_ODL_CLUSTER must all be configured in Env field"
+     return
+    fi
+
     if $IS_PRIMARY_CLUSTER; then
        PRIMARY_NODE=${MY_ODL_CLUSTER}
        SECONDARY_NODE=${PEER_ODL_CLUSTER}
@@ -60,7 +58,19 @@ function enable_odl_cluster(){
     fi
 
     node_list="${PRIMARY_NODE} ${SECONDARY_NODE}"
+
     /opt/onap/sdnc/bin/configure_geo_cluster.sh $((node_index+member_offset)) ${node_list}
+  else
+    echo "This is a local cluster"
+
+    node_list="${node}-0.{{.Values.service.name}}-cluster.{{.Release.Namespace}}";
+
+    for ((i=1;i<${SDNC_REPLICAS};i++));
+    do
+      node_list="${node_list} ${node}-$i.{{.Values.service.name}}-cluster.{{.Release.Namespace}}"
+    done
+
+    /opt/opendaylight/current/bin/configure_cluster.sh $((node_index+1)) ${node_list}
   fi
 }
 
@@ -70,13 +80,14 @@ function enable_odl_cluster(){
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
+SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
 CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
+MYSQL_HOST=${MYSQL_HOST:-{{.Values.config.dbServiceName}}.{{.Release.Namespace}}}
 ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
-MYSQL_HOST=${MYSQL_HOST:-{{.Release.Name}}-{{.Values.mysql.nameOverride}}-0.{{.Values.mysql.service.name}}.{{.Release.Namespace}}}
-IS_PRIMARY_CLUSTER=${IS_PRIMARY_CLUSTER:-false}
-MY_ODL_CLUSTER=${MY_ODL_CLUSTER:-127.0.0.1}
+GEO_ENABLED=${GEO_ENABLED:-false}
+DBINIT_DIR=${DBINIT_DIR:-/opt/opendaylight/current/daexim}
 
 #
 # Wait for database to init properly
@@ -89,35 +100,42 @@ do
 done
 echo -e "\nmysql ready"
 
-if [ ! -f ${SDNC_HOME}/.installed ]
+if [ ! -d ${DBINIT_DIR} ]
+then
+    mkdir -p ${DBINIT_DIR}
+fi
+
+if [ ! -f ${DBINIT_DIR}/.installed ]
 then
         echo "Installing SDNC database"
         ${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
+
         if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
         then
                 echo "Installing directed graphs"
                 ${SDNC_HOME}/svclogic/bin/install.sh
         fi
 
-        if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
+        echo "Installed at `date`" > ${DBINIT_DIR}/.installed
+fi
+
+if [ ! -f ${SDNC_HOME}/.installed ]
+then
+	echo "Installing SDN-C keyStore"
+	${SDNC_HOME}/bin/addSdncKeyStore.sh
 
-        echo "Restarting OpenDaylight"
-        ${ODL_HOME}/bin/stop
+	# No longer needed (this was a workaround for bug in Nitrogen)
+	#${CCSDK_HOME}/bin/installOdlHostKey.sh
 
-        echo "Waiting 60 seconds for OpenDaylight stop to complete"
-        sleep 60
+	if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
 
         echo "Installed at `date`" > ${SDNC_HOME}/.installed
 fi
 
-exec ${ODL_HOME}/bin/karaf
+cp /opt/opendaylight/current/certs/* /tmp
+
+nohup python ${SDNC_BIN}/installCerts.py &
+
+
+exec ${ODL_HOME}/bin/karaf server