From 1383828a967c85d111a9d1fc6e709c6c9afb95af Mon Sep 17 00:00:00 2001 From: Herbert Eiselt Date: Wed, 3 Apr 2019 18:33:12 +0200 Subject: SDNC oam installer mdsal clustering startODL change to install mdsal clustering and jolokia Change-Id: If9b850630552d281b3f68e53b6f1fed9bddb1c3d Issue-ID: SDNC-713 Signed-off-by: Herbert Eiselt Former-commit-id: 864867b75ffad3544320d72d85a13a0936464558 --- installation/sdnc/src/main/scripts/startODL.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index 09876252..d15fe2a1 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,8 @@ 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-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 -- cgit 1.2.3-korg