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
7a22487
..
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() {
@@
-251,6
+253,9
@@
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
export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME
NOTOK=1
#export for installCerts.py
export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME
@@
-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