bug fix: aline with odl service script and karaf

JIRA: COMPASS-183

Change-Id: Ibf2ba93b0135f6b71f1b824e5aaf77848788505f
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf
index d04cac2..105bb26 100755 (executable)
--- 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