summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-04-03 17:11:46 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-03 17:11:46 +0000
commitaa6deb9532f2a4433a7daf1ac3e62e6cece7cf20 (patch)
tree2ea552f3368fb9873c4feee8e1ed75d2ee73962e
parent4905bd4a1dcd18e8175a18e6044f2edc02654df9 (diff)
parent1383828a967c85d111a9d1fc6e709c6c9afb95af (diff)
Merge "SDNC oam installer mdsal clustering"
Former-commit-id: b5f6c27706380e96ff36b7b38d08b1a8c4469e4c
-rwxr-xr-xinstallation/sdnc/src/main/scripts/startODL.sh14
1 files 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