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
fix a1-adapter-northbound startup
[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
bcf8893
..
f029e87
100755
(executable)
--- a/
installation/sdnc/src/main/scripts/startODL.sh
+++ b/
installation/sdnc/src/main/scripts/startODL.sh
@@
-116,7
+116,9
@@
install_sdnr_oauth_features() {
install_sdnr_northbound_features() {
addToFeatureBoot "$SDNR_NORTHBOUND_BOOTFEATURES"
}
install_sdnr_northbound_features() {
addToFeatureBoot "$SDNR_NORTHBOUND_BOOTFEATURES"
}
-
+install_a1_northbound_features() {
+ addToFeatureBoot "$A1_ADAPTER_NORTHBOUND_BOOTFEATURES"
+}
# Reconfigure ODL from default single node configuration to cluster
enable_odl_cluster() {
# Reconfigure ODL from default single node configuration to cluster
enable_odl_cluster() {
@@
-212,7
+214,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_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_FEATURES_BOOT_FILE=$ODL_HOME/etc/org.apache.karaf.features.cfg
-ODL_
USER=${ODL_USER
:-admin}
+ODL_
ADMIN_USERNAME=${ODL_ADMIN_USERNAME
:-admin}
ODL_REMOVEIDMDB=${ODL_REMOVEIDMDB:-true}
if $ODL_REMOVEIDMDB ; then
ODL_REMOVEIDMDB=${ODL_REMOVEIDMDB:-true}
if $ODL_REMOVEIDMDB ; then
@@
-251,9
+253,12
@@
SDNRDBCOMMAND=${SDNRDBCOMMAND:--c init -db $SDNRDBURL -dbu $SDNRDBUSERNAME -dbp
SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
+A1_ADAPTER_NORTHBOUND=${A1_ADAPTER_NORTHBOUND:-true}
+A1_ADAPTER_NORTHBOUND_BOOTFEATURES=${A1_ADAPTER_NORTHBOUND_BOOTFEATURES:-a1-adapter-northbound}
+
NOTOK=1
#export for installCerts.py
NOTOK=1
#export for installCerts.py
-export ODL_
PASSWORD ODL_USER
+export ODL_
ADMIN_PASSWORD ODL_ADMIN_USERNAME
if $JDEBUG ; then
printf "Activate remote debugging\n"
if $JDEBUG ; then
printf "Activate remote debugging\n"
@@
-326,8
+331,8
@@
if $SDNRINIT ; then
fi
# do not start container if ADMIN_PASSWORD is not set
fi
# do not start container if ADMIN_PASSWORD is not set
-if [ -z "$ODL_PASSWORD" ]; then
- echo "ODL_PASSWORD is not set"
+if [ -z "$ODL_
ADMIN_
PASSWORD" ]; then
+ echo "ODL_
ADMIN_
PASSWORD is not set"
exit 1
fi
exit 1
fi
@@
-379,6
+384,8
@@
then
if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
if $SDNR_NORTHBOUND ; then install_sdnr_northbound_features ; fi
if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
if $SDNR_NORTHBOUND ; then install_sdnr_northbound_features ; fi
+ if $A1_ADAPTER_NORTHBOUND ; then install_a1_northbound_features ; fi
+
printf "%s" "Installed at $(date)" > "${SDNC_HOME}"/.installed
fi
printf "%s" "Installed at $(date)" > "${SDNC_HOME}"/.installed
fi