From: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Date: Mon, 26 Oct 2020 17:14:52 +0000 (+0000)
Subject: Merge "Add all missing specific devicemanagers" into guilin
X-Git-Tag: 2.0.3~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=255c71d969f82d71c0c5e882390823ab95d059c1;hp=8cd8bd44a08217d37683b7b2be24fdc447bf2ffd;p=sdnc%2Foam.git

Merge "Add all missing specific devicemanagers" into guilin

Former-commit-id: 682b52483b4ec58df21526d6308dfe95cc087b64
---

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}