diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2015-12-05 12:22:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-05 12:22:48 +0000 |
| commit | 6bd27622a1a733c8527e8c9378dd07897bd434ca (patch) | |
| tree | 8d56873f7c562865eec735d354dbf702b39af380 /deploy/adapters/ansible/roles/odl_cluster/templates | |
| parent | 3c3a10bbbf4c56ed9974345d134958561d779cf1 (diff) | |
| parent | 134c7b2d1613030e3e6e245c1287e09d0ee6df94 (diff) | |
Merge "bug fix: aline with odl service script and karaf"
Diffstat (limited to 'deploy/adapters/ansible/roles/odl_cluster/templates')
| -rwxr-xr-x | deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf index d04cac22..105bb265 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf @@ -13,7 +13,7 @@ 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=false -Dkaraf.startRemoteShell=true" +env OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true" env MAIN="org.apache.karaf.main.Main" @@ -26,6 +26,7 @@ script 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 @@ -36,6 +37,6 @@ script fi done - exec $JAVA_HOME/bin/java $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 + 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 |