X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=blobdiff_plain;f=installation%2Fsdnc%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=7de8e50897647ca55e9485e2aad48a0a084d632c;hp=b2dbe00137cd16e01f67be293e993f3506b02fbb;hb=refs%2Fheads%2Fmaster;hpb=68aa82ac95c57a7c75fb2a2788b61fdd0fc70be7

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index b2dbe001..7de8e508 100755
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -90,11 +90,15 @@ initialize_sdnrdb() {
   printf "%s\n" "Execute: $INITCMD"
   n=0
   until [ $n -ge 5 ] ; do
-    $INITCMD && break
+    $INITCMD
+    ret=$?
+    if [ $ret -eq 0 ] ; then
+      break;
+    fi
     n=$((n+1))
     sleep 15
   done
-  return $?
+  return $ret
 }
 
 install_sdnrwt_features() {
@@ -104,9 +108,6 @@ install_sdnrwt_features() {
       cleanupFeatureBoot
     fi
     addToFeatureBoot "$SDNRDM_BOOTFEATURES"
-    if ! $SDNRDM; then
-      addToFeatureBoot "$SDNRODLUX_BOOTFEATURES"
-    fi
     if $SDNR_NETCONF_CALLHOME_ENABLED; then
       addToFeatureBoot "$SDNR_NETCONF_CALLHOME_FEATURE"
     fi
@@ -247,7 +248,6 @@ GEO_ENABLED=${GEO_ENABLED:-false}
 
 SDNRWT=${SDNRWT:-false}
 SDNRDM=${SDNRDM:-false}
-SDNRODLUX_BOOTFEATURES=${SDNRODLUX_BOOTFEATURES:-sdnr-wt-helpserver-feature,sdnr-wt-odlux-core-feature,sdnr-wt-odlux-apps-feature}
 SDNROAUTH_BOOTFEATURES=${SDNROAUTH_BOOTFEATURES:-sdnr-wt-feature-aggregator-oauth}
 SDNR_NETCONF_CALLHOME_ENABLED=${SDNR_NETCONF_CALLHOME_ENABLED:-false}
 
@@ -261,6 +261,7 @@ SDNRONLY=${SDNRONLY:-false}
 SDNRDBTYPE=${SDNRDBTYPE:-ELASTICSEARCH}
 SDNRDBURL=${SDNRDBURL:-http://sdnrdb:9200}
 SDNRDBCOMMAND=${SDNRDBCOMMAND:--c init -db $SDNRDBURL -dbt $SDNRDBTYPE -dbu $SDNRDBUSERNAME -dbp $SDNRDBPASSWORD $SDNRDBPARAMETER}
+SDNR_WEBSOCKET_PORT=${SDNR_WEBSOCKET_PORT:-8182}
 
 SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
 SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
@@ -309,6 +310,7 @@ printf "%s\n" "  SDNRDM=$SDNRDM"
 printf "%s\n" "  SDNRONLY=$SDNRONLY"
 printf "%s\n" "  SDNRINIT=$SDNRINIT"
 printf "%s\n" "  SDNRDBURL=$SDNRDBURL"
+printf "%s\n" "  SDNRDBTYPE=$SDNRDBTYPE"
 printf "%s\n" "  SDNRDBUSERNAME=$SDNRDBUSERNAME"
 printf "%s\n" "  GEO_ENABLED=$GEO_ENABLED"
 printf "%s\n" "  IS_PRIMARY_CLUSTER=$IS_PRIMARY_CLUSTER"
@@ -342,6 +344,10 @@ if $SDNRINIT ; then
   init_result=$?
   printf "%s\n" "Result of init script: $init_result"
   if $SDNRWT ; then
+    if [ $init_result -ne 0 ]; then
+      echo "db not initialized. stopping container"
+      exit $init_result
+    fi
     printf "Proceed to initialize sdnr\n"
   else
     exit $init_result
@@ -395,7 +401,7 @@ then
   if $SDNRWT ; then install_sdnrwt_features ; fi
   if $ENABLE_OAUTH ; then
     cp $SDNC_HOME/data/oauth-aaa-app-config.xml $(find $ODL_HOME/system/org/opendaylight/aaa/ -name *aaa-app-config.xml)
-    echo -e "\norg.ops4j.pax.web.session.cookie = none" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
+    echo -e "\norg.ops4j.pax.web.session.cookie.comment = disable" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
     install_sdnr_oauth_features
   fi