Remove embedded passwords

[sdnc/oam.git] / installation / sdnc / src / main / scripts / startODL.sh

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index 81e6d7f..bcf8893 100755 (executable)
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -212,7 +212,7 @@ printf "Installing SDNC/R from startODL.sh script\n"
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_FEATURES_BOOT_FILE=$ODL_HOME/etc/org.apache.karaf.features.cfg
 
-ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin}
+ODL_USER=${ODL_USER:-admin}
 ODL_REMOVEIDMDB=${ODL_REMOVEIDMDB:-true}
 
 if $ODL_REMOVEIDMDB ; then
@@ -220,11 +220,7 @@ if $ODL_REMOVEIDMDB ; then
     rm $ODL_HOME/data/idmlight.db.mv.db
   fi
 fi
-# do not start container if ADMIN_PASSWORD is not set
-if [ -z "$ODL_ADMIN_PASSWORD" ]; then
-  echo "ODL_ADMIN_PASSWORD is not set"
-  exit 1
-fi
+
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
 SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
 # Whether to intialize MYSql DB or not. Default is to initialize
@@ -257,7 +253,7 @@ SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
 SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
 NOTOK=1
 #export for installCerts.py
-export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME
+export ODL_PASSWORD ODL_USER
 
 if $JDEBUG ; then
     printf "Activate remote debugging\n"
@@ -329,6 +325,12 @@ if $SDNRINIT ; then
   fi
 fi
 
+# do not start container if ADMIN_PASSWORD is not set
+if [ -z "$ODL_PASSWORD" ]; then
+  echo "ODL_PASSWORD is not set"
+  exit 1
+fi
+
 # Check for MySQL DB connectivity only if SDNC_DB_INIT is set to "true" 
 if $SDNC_DB_INIT; then
 #
@@ -343,6 +345,7 @@ if $SDNC_DB_INIT; then
   printf "\nmysql ready"
 fi
 
+
 if [ ! -d "${INSTALLED_DIR}" ]
 then
     mkdir -p "${INSTALLED_DIR}"
@@ -367,7 +370,10 @@ then
     fi
 
   if $SDNRWT ; then install_sdnrwt_features ; fi
-  if $ENABLE_OAUTH ; then install_sdnr_oauth_features ; fi
+  if $ENABLE_OAUTH ; then
+    cp $SDNC_HOME/data/oauth-aaa-app-config.xml $ODL_HOME/system/org/opendaylight/aaa/aaa-shiro/0.12.1/aaa-shiro-0.12.1-aaa-app-config.xml
+    install_sdnr_oauth_features 
+  fi
   
   # The enable_odl_cluster call should not be moved above this line as the cleanFeatureBoot will overwrite entries. Ex: odl-jolokia
   if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi