Builder job for deploying Openstack for testing

[releng/builder.git] / jjb / integration / include-raw-integration-configure-clustering.sh

diff --git a/jjb/integration/include-raw-integration-configure-clustering.sh b/jjb/integration/include-raw-integration-configure-clustering.sh
index 0950622f247c4f18cbc0c65d209cf996c2fd418b..264f659b3e384a6cc5f828cf28a2ff210df42555 100644 (file)
--- a/jjb/integration/include-raw-integration-configure-clustering.sh
+++ b/jjb/integration/include-raw-integration-configure-clustering.sh
@@ -65,6 +65,7 @@ unzip -q ${BUNDLE}
 
 echo "Configuring the startup features..."
 FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
+CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
 sed -ie "s/featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${ACTUALFEATURES}/g" \${FEATURESCONF}
 sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" \${FEATURESCONF}
 cat \${FEATURESCONF}
@@ -76,6 +77,12 @@ sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupInde
 sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
 cat \${LOGCONF}
 
+if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
+  echo "Enable the l3.fwd in custom.properties.."
+  echo "ovsdb.l3.fwd.enabled=yes" >> \${CUSTOMPROP}
+  cat \${CUSTOMPROP}
+fi
+
 echo "Configure java home and max memory..."
 MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
 sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' \${MEMCONF}