From 08fc4477bff0219d0277a63a9ab82a03087f7ef5 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Wed, 25 Jan 2017 20:54:29 +0800 Subject: Upgrade OpenDaylight to Boron ( l3 scenario ) JIRA: COMPASS-512 1. Use package distribution-karaf-0.5.2-Boron.tar.gz 2. Add configuring ACL 3. Remove neutron-l3 agent in odl_cluster role 4. Fix ODL l2 metadata problem Change-Id: Ib14cdf3539deeeb91ebfec0450a9e7f0228f7741 Signed-off-by: Harry Huang --- .../roles/odl_cluster/templates/opendaylight.conf | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100755 deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf (limited to 'deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf') diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf deleted file mode 100755 index 105bb265..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf +++ /dev/null @@ -1,42 +0,0 @@ - -# vim:set ft=upstart ts=2 et: -description "OpenDaylight controller" -author "mskalski@miranits.com" - -start on runlevel [2345] -stop on runlevel [!2345] - -#setgid odl -#setuid odl - -env KARAF_HOME="/opt/opendaylight-0.3.0" -#env JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64" -env JAVA_HOME="/usr/lib/jvm/java-8-oracle" -env JAVA_OPTS="-server -Xms128M -Xmx4096M -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:MaxPermSize=512M -Dcom.sun.management.jmxremote" -env OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true" -env MAIN="org.apache.karaf.main.Main" - - -chdir /opt/opendaylight-0.3.0 - -script - export KARAF_BASE="$KARAF_HOME" - export KARAF_DATA="$KARAF_BASE/data" - export KARAF_ETC="$KARAF_BASE/etc" - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib" - export JAVA_ENDORSED_DIRS="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed" - export JAVA_EXT_DIRS="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext" - export JAVA_SECURITY_PRO="${KARAF_HOME}/etc/odl.java.security" - - for file in "$KARAF_HOME"/lib/karaf*.jar - do - if [ -z "$CLASSPATH" ]; then - CLASSPATH="$file" - else - CLASSPATH="$CLASSPATH:$file" - fi - done - - exec $JAVA_HOME/bin/java -Djava.security.properties="${JAVA_SECURITY_PRO}" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN - -end script -- cgit 1.2.3-korg