Code Review
/
sdnc
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
rollback scripts to bash
[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
ccddd94
..
86d1e09
100755
(executable)
--- a/
installation/sdnc/src/main/scripts/startODL.sh
+++ b/
installation/sdnc/src/main/scripts/startODL.sh
@@
-51,6
+51,10
@@
function install_sdnrwt_features() {
addToFeatureBoot "$SDNRWT_BOOTFEATURES" $SDNRWT_REPOSITORY
}
addToFeatureBoot "$SDNRWT_BOOTFEATURES" $SDNRWT_REPOSITORY
}
+function install_sdnr_northbound_features() {
+ addToFeatureBoot "$SDNR_NORTHBOUND_BOOTFEATURES" $SDNR_NORTHBOUND_REPOSITORY
+}
+
function enable_odl_cluster(){
if [ -z $SDNC_REPLICAS ]; then
echo "SDNC_REPLICAS is not configured in Env field"
function enable_odl_cluster(){
if [ -z $SDNC_REPLICAS ]; then
echo "SDNC_REPLICAS is not configured in Env field"
@@
-102,6
+106,7
@@
function enable_odl_cluster(){
# Install SDN-C platform components if not already installed and start container
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
# Install SDN-C platform components if not already installed and start container
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
+ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin}
ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
@@
-114,12
+119,16
@@
MY_ODL_CLUSTER=${MY_ODL_CLUSTER:-127.0.0.1}
INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim}
SDNRWT=${SDNRWT:-false}
SDNRWT_BOOTFEATURES=${SDNRWT_BOOTFEATURES:-sdnr-wt-feature-aggregator}
INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim}
SDNRWT=${SDNRWT:-false}
SDNRWT_BOOTFEATURES=${SDNRWT_BOOTFEATURES:-sdnr-wt-feature-aggregator}
-
+SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
+SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
+export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME
echo "Settings:"
echo " ENABLE_ODL_CLUSTER=$ENABLE_ODL_CLUSTER"
echo " SDNC_REPLICAS=$SDNC_REPLICAS"
echo " SDNRWT=$SDNRWT"
echo "Settings:"
echo " ENABLE_ODL_CLUSTER=$ENABLE_ODL_CLUSTER"
echo " SDNC_REPLICAS=$SDNC_REPLICAS"
echo " SDNRWT=$SDNRWT"
+echo " SDNR_NORTHBOUND=$SDNR_NORTHBOUND"
+
#
# Wait for database
#
# Wait for database
@@
-143,6
+152,8
@@
then
${SDNC_HOME}/bin/installSdncDb.sh
echo "Installing SDN-C keyStore"
${SDNC_HOME}/bin/addSdncKeyStore.sh
${SDNC_HOME}/bin/installSdncDb.sh
echo "Installing SDN-C keyStore"
${SDNC_HOME}/bin/addSdncKeyStore.sh
+ echo "Installing A1-adapter trustStore"
+ ${SDNC_HOME}/bin/addA1TrustStore.sh
#${CCSDK_HOME}/bin/installOdlHostKey.sh
#${CCSDK_HOME}/bin/installOdlHostKey.sh
@@
-156,11
+167,17
@@
then
if $SDNRWT ; then install_sdnrwt_features ; fi
if $SDNRWT ; then install_sdnrwt_features ; fi
+ if $SDNR_NORTHBOUND ; then install_sdnr_northbound_features ; fi
+
echo "Installed at `date`" > ${INSTALLED_DIR}/.installed
fi
cp /opt/opendaylight/current/certs/* /tmp
echo "Installed at `date`" > ${INSTALLED_DIR}/.installed
fi
cp /opt/opendaylight/current/certs/* /tmp
+cp /var/custom-certs/* /tmp
-nohup python ${SDNC_BIN}/installCerts.py &
+# Create ODL data log directory (it nornally is created after karaf
+# is started, but needs to exist before installCerts.py runs)
+mkdir -p /opt/opendaylight/data/log
+nohup python3 ${SDNC_BIN}/installCerts.py &
exec ${ODL_HOME}/bin/karaf server
exec ${ODL_HOME}/bin/karaf server