diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-04-03 17:12:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-03 17:12:46 +0000 |
| commit | 5f9fa10cd1af4fe07c91ca7de851471806ce3eac (patch) | |
| tree | 6db04dd744654a5d60c5383f89486f08ecb56cf2 | |
| parent | aa6deb9532f2a4433a7daf1ac3e62e6cece7cf20 (diff) | |
| parent | 0488fcdb94834b2f1be00ce3871ea5d532e510a6 (diff) | |
Merge "SDNC oam installer netconf clustering"
Former-commit-id: 1ea6affa79629dbd511502a4daee3a1435c0d127
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/scripts/startODL.sh | 1 |
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 |