diff options
| -rw-r--r-- | installation/sdnc/pom.xml | 4 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/scripts/startODL.sh | 15 |
3 files changed, 16 insertions, 5 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 74f37cf2..c26b4361 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -20,8 +20,8 @@ <image.name>onap/sdnc-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> - <sdnc.northbound.version>1.5.0</sdnc.northbound.version> - <ccsdk.docker.version>0.4.1-STAGING-latest</ccsdk.docker.version> + <sdnc.northbound.version>1.5.1-SNAPSHOT</sdnc.northbound.version> + <ccsdk.docker.version>0.4.2-STAGING-latest</ccsdk.docker.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> 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 09876252..ccddd944 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -37,6 +37,16 @@ function addToFeatureBoot() { cat $ORIG | sed -e "\|featuresBoot *=|s|$|,$1|" > $CFG } +# Append features to karaf boot feature configuration +# $1 search pattern +# $2 replacement +function replaceFeatureBoot() { + CFG=$ODL_HOME/etc/org.apache.karaf.features.cfg + ORIG=$CFG.orig + echo "Replace boot feature $1 with: $2" + sed -i "/featuresBoot/ s/$1/$2/g" $CFG +} + function install_sdnrwt_features() { addToFeatureBoot "$SDNRWT_BOOTFEATURES" $SDNRWT_REPOSITORY } @@ -48,8 +58,9 @@ function enable_odl_cluster(){ fi echo "Installing Opendaylight cluster features" - mv $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig - cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresBoot=config|s|$|,odl-mdsal-clustering,odl-jolokia|" > $ODL_HOME/etc/org.apache.karaf.features.cfg + 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 #${ODL_HOME}/bin/client feature:install odl-jolokia |