aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Eiselt <herbert.eiselt@highstreet-technologies.com>2019-04-03 18:56:36 +0200
committerHerbert Eiselt <herbert.eiselt@highstreet-technologies.com>2019-04-03 18:57:35 +0200
commit0488fcdb94834b2f1be00ce3871ea5d532e510a6 (patch)
tree342ed7d1dea4c7548a3e508db1f93c4e33bd5c9a
parent1383828a967c85d111a9d1fc6e709c6c9afb95af (diff)
SDNC oam installer netconf clustering
startODL enable odl cluster to install netconf clustering Change-Id: I436106e4a1b963f2ca985eb41f8ab760a577079b Issue-ID: SDNC-719 Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com> Former-commit-id: b5e19cf4c857fc1d5aba5043fc792550cc8835de
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile2
-rwxr-xr-xinstallation/sdnc/src/main/scripts/startODL.sh1
2 files changed, 2 insertions, 1 deletions
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