initialize_sdnrdb() {
printf "SDN-R Database Initialization"
INITCMD="$JAVA_HOME/bin/java -jar "
- FN=$(find "$ODL_HOME/system" -name "sdnr-wt-data-provider-setup-${ccsdk.features.version}.jar")
+ FN=$(find "$ODL_HOME/system" -name "sdnr-wt-data-provider-setup-*.jar")
INITCMD="${INITCMD} ${FN} $SDNRDBCOMMAND"
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() {
cleanupFeatureBoot
fi
addToFeatureBoot "$SDNRDM_BOOTFEATURES"
- if ! $SDNRDM; then
- addToFeatureBoot "$SDNRODLUX_BOOTFEATURES"
- fi
if $SDNR_NETCONF_CALLHOME_ENABLED; then
addToFeatureBoot "$SDNR_NETCONF_CALLHOME_FEATURE"
fi
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
+FEATURESBOOTMARKER="featuresBoot *="
+REPOSITORIESBOOTMARKER="featuresRepositories *="
ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-admin}
ODL_REMOVEIDMDB=${ODL_REMOVEIDMDB:-true}
if $ODL_REMOVEIDMDB ; then
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}
# Whether to Initialize the ElasticSearch DB.
SDNRINIT=${SDNRINIT:-false}
SDNRONLY=${SDNRONLY:-false}
+SDNRDBTYPE=${SDNRDBTYPE:-ELASTICSEARCH}
SDNRDBURL=${SDNRDBURL:-http://sdnrdb:9200}
-SDNRDBCOMMAND=${SDNRDBCOMMAND:--c init -db $SDNRDBURL -dbu $SDNRDBUSERNAME -dbp $SDNRDBPASSWORD $SDNRDBPARAMETER}
+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}
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"
sed -i '/org.ops4j.pax.web.ssl.password/d' "$ODL_HOME"/etc/custom.properties
sed -i '/org.ops4j.pax.web.ssl.keypassword/d' "$ODL_HOME"/etc/custom.properties
echo "org.ops4j.pax.web.ssl.keystore=$SDNC_AAF_STORE_DIR/$SDNC_KEYSTORE" >> "$ODL_HOME"/etc/custom.properties
- echo "org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS" >> "$ODL_HOME"/etc/custom.properties
- echo "org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS" >> "$ODL_HOME"/etc/custom.properties
+ echo "org.ops4j.pax.web.ssl.password=\"$SDNC_KEYPASS\"" >> "$ODL_HOME"/etc/custom.properties
+ echo "org.ops4j.pax.web.ssl.keypassword=\"$SDNC_KEYPASS\"" >> "$ODL_HOME"/etc/custom.properties
fi
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
if $SDNRWT ; then install_sdnrwt_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
+ 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.comment = disable" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
install_sdnr_oauth_features
fi