summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Eiselt <herbert.eiselt@highstreet-technologies.com>2020-10-26 17:14:52 +0000
committerGerrit Code Review <gerrit@onap.org>2020-10-26 17:14:52 +0000
commit255c71d969f82d71c0c5e882390823ab95d059c1 (patch)
treea9b0e3f188d341dd5d5ecb0a40554fe77cea7da2
parent8cd8bd44a08217d37683b7b2be24fdc447bf2ffd (diff)
parenta86abbdceb7356c79f063c9b9b88a5c2f4ac3237 (diff)
Merge "Add all missing specific devicemanagers" into guilin
Former-commit-id: 682b52483b4ec58df21526d6308dfe95cc087b64
-rwxr-xr-xinstallation/sdnc/src/main/scripts/startODL.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index 57f3cbfc..7f196603 100755
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -101,7 +101,6 @@ function install_sdnrwt_features() {
# Repository setup provided via sdnc dockerfile
if $SDNRWT; then
addRepository $SDNRDM_BASE_REPO
- addRepository $SDNRDM_ONF_REPO
if $SDNRONLY; then
cleanupFeatureBoot
@@ -241,9 +240,8 @@ SDNRWT_BOOTFEATURES=${SDNRWT_BOOTFEATURES:-sdnr-wt-feature-aggregator}
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}
-SDNRDM_ONF_REPO=${SDNRDM_ONF_REPO:-mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-devicemanager-onf-feature/$CCSDKFEATUREVERSION/xml/features}
# Add devicemanager features
-SDNRDM_SDM_LIST=${SDNRDM_SDM_LIST:-sdnr-wt-devicemanager-onf-feature}
+SDNRDM_SDM_LIST=${SDNRDM_SDM_LIST:-sdnr-wt-feature-aggregator-devicemanager}
SDNRDM_BOOTFEATURES=${SDNRDM_BOOTFEATURES:-sdnr-wt-feature-aggregator-devicemanager-base, ${SDNRDM_SDM_LIST}}
# Whether to Initialize the ElasticSearch DB.
SDNRINIT=${SDNRINIT:-false}