From 860506c03cf20ea27121a2031a3d81d0170b1f54 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Wed, 9 Sep 2015 05:24:11 -0400 Subject: Support OpenDayLight Lithium deployment JIRA: COMPASS-35 Change-Id: I54763234ff4d708ae97e553372dd601fe9ea6fd4 Signed-off-by: chenshuai@huawei.com --- deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf | 0 deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh | 0 .../ansible/roles/odl_cluster/templates/module-shards.conf | 0 .../ansible/roles/odl_cluster/templates/opendaylight.conf | 9 +++++---- .../ansible/roles/odl_cluster/templates/opendaylight.service | 0 .../roles/odl_cluster/templates/org.apache.karaf.features.cfg | 0 .../ansible/roles/odl_cluster/templates/tomcat-server.xml | 0 7 files changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/tomcat-server.xml (limited to 'deploy/adapters/ansible/roles/odl_cluster/templates') diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf old mode 100644 new mode 100755 diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh old mode 100644 new mode 100755 diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf old mode 100644 new mode 100755 diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf old mode 100644 new mode 100755 index c9a36f2e..d04cac22 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf @@ -6,11 +6,12 @@ author "mskalski@miranits.com" start on runlevel [2345] stop on runlevel [!2345] -setgid odl -setuid odl +#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-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 MAIN="org.apache.karaf.main.Main" @@ -35,6 +36,6 @@ script fi done - exec /usr/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 $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 diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service old mode 100644 new mode 100755 diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg old mode 100644 new mode 100755 diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/tomcat-server.xml b/deploy/adapters/ansible/roles/odl_cluster/templates/tomcat-server.xml old mode 100644 new mode 100755 -- cgit 1.2.3-korg