From: Dan Timoney <dtimoney@att.com>
Date: Wed, 3 Apr 2019 17:12:46 +0000 (+0000)
Subject: Merge "SDNC oam installer netconf clustering"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1ea6affa79629dbd511502a4daee3a1435c0d127;hp=b5f6c27706380e96ff36b7b38d08b1a8c4469e4c;p=sdnc%2Foam.git

Merge "SDNC oam installer netconf clustering"
---

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 99bfa3a9..d8ab5c39 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -37,7 +37,7 @@ RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system
 RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
 RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-clustered-topology/g"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 RUN chown -R odl /opt
 USER odl
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index d15fe2a1..ccddd944 100755
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -58,6 +58,7 @@ function enable_odl_cluster(){
   fi
 
   echo "Installing Opendaylight cluster features"
+  replaceFeatureBoot odl-netconf-topology odl-netconf-clustered-topology
   replaceFeatureBoot odl-mdsal-all odl-mdsal-all,odl-mdsal-clustering
   addToFeatureBoot odl-jolokia
   #${ODL_HOME}/bin/client feature:install odl-mdsal-clustering