diff options
Diffstat (limited to 'installation/sdnc/src/main/scripts/startODL.sh')
| -rwxr-xr-x | installation/sdnc/src/main/scripts/startODL.sh | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index dbbe4030..5e294ddf 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -82,7 +82,7 @@ cleanupFeatureBoot() { sed -i "/featuresBoot/ s/,ccsdk-sli-core-all.*$//g" "$ODL_FEATURES_BOOT_FILE" } -initialize_sdnr() { +initialize_sdnrdb() { printf "SDN-R Database Initialization" INITCMD="$JAVA_HOME/bin/java -jar " INITCMD="${INITCMD} $ODL_HOME/system/org/onap/ccsdk/features/sdnr/wt/sdnr-wt-data-provider-setup/$CCSDKFEATUREVERSION/sdnr-dmt.jar " @@ -100,19 +100,19 @@ initialize_sdnr() { install_sdnrwt_features() { # Repository setup provided via sdnc dockerfile if $SDNRWT; then - addRepository "$SDNRDM_BASE_REPO" if $SDNRONLY; then cleanupFeatureBoot fi - if $SDNRDM; then - addToFeatureBoot "$SDNRDM_BOOTFEATURES" - else - addToFeatureBoot "$SDNRWT_BOOTFEATURES" + addToFeatureBoot "$SDNRDM_BOOTFEATURES" + if ! $SDNRDM; then + addToFeatureBoot "$SDNRODLUX_BOOTFEATURES" fi fi } - +install_sdnr_oauth_features() { + addToFeatureBoot "$SDNROAUTH_BOOTFEATURES" +} install_sdnr_northbound_features() { addToFeatureBoot "$SDNR_NORTHBOUND_BOOTFEATURES" } @@ -211,18 +211,13 @@ enable_odl_cluster() { 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_REMOVEIDMDB=${ODL_REMOVEIDMDB:-false} ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin} -if $ODL_REMOVEIDMDB ; then - printf "Remove odl idmdb" - rm "$ODL_HOME"/data/idmlight.db.mv.db - ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-admin} -else - ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} +# 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 -ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} 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 @@ -231,19 +226,20 @@ CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} JDEBUG=${JDEBUG:-false} MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0} ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false} +ENABLE_OAUTH=${ENABLE_OAUTH:-false} +ENABLE_ODLUX_RBAC=${ENABLE_ODLUX_RBAC:-false} GEO_ENABLED=${GEO_ENABLED:-false} SDNC_AAF_ENABLED=${SDNC_AAF_ENABLED:-false} IS_PRIMARY_CLUSTER=${IS_PRIMARY_CLUSTER:-false} 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} +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} SDNRDM=${SDNRDM:-false} -# Add devicemanager base and specific repositories -SDNRDM_BASE_REPO=${SDNRDM_BASE_REPO:-mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/$CCSDKFEATUREVERSION/xml/features} # Add devicemanager features SDNRDM_SDM_LIST=${SDNRDM_SDM_LIST:-sdnr-wt-feature-aggregator-devicemanager} -SDNRDM_BOOTFEATURES=${SDNRDM_BOOTFEATURES:-sdnr-wt-feature-aggregator-devicemanager-base, ${SDNRDM_SDM_LIST}} +SDNRDM_BOOTFEATURES=${SDNRDM_BOOTFEATURES:-sdnr-wt-feature-aggregator-devicemanager-base,${SDNRDM_SDM_LIST}} # Whether to Initialize the ElasticSearch DB. SDNRINIT=${SDNRINIT:-false} SDNRONLY=${SDNRONLY:-false} @@ -253,6 +249,7 @@ SDNRDBCOMMAND=${SDNRDBCOMMAND:--c init -db $SDNRDBURL -dbu $SDNRDBUSERNAME -dbp 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 if $JDEBUG ; then @@ -280,6 +277,8 @@ printf "%s\n" " CCSDKFEATUREVERSION=$CCSDKFEATUREVERSION" printf "%s\n" " ENABLE_ODL_CLUSTER=$ENABLE_ODL_CLUSTER" printf "%s\n" " ODL_REMOVEIDMDB=$ODL_REMOVEIDMDB" printf "%s\n" " SDNC_REPLICAS=$SDNC_REPLICAS" +printf "%s\n" " ENABLE_OAUTH=$ENABLE_OAUTH" +printf "%s\n" " ENABLE_ODLUX_RBAC=$ENABLE_ODLUX_RBAC" printf "%s\n" " SDNRWT=$SDNRWT" printf "%s\n" " SDNRDM=$SDNRDM" printf "%s\n" " SDNRONLY=$SDNRONLY" @@ -313,7 +312,7 @@ fi if $SDNRINIT ; then #One time intialization action - initialize_sdnr + initialize_sdnrdb init_result=$? printf "%s\n" "Result of init script: $init_result" if $SDNRWT ; then @@ -361,6 +360,8 @@ then fi if $SDNRWT ; then install_sdnrwt_features ; fi + if $ENABLE_OAUTH ; then 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 |