summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/odl_cluster/templates
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2015-09-09 05:24:11 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2015-09-09 05:30:00 -0400
commit860506c03cf20ea27121a2031a3d81d0170b1f54 (patch)
tree7c25749337ac5b5ee20b602b4ffeb8572f136da3 /deploy/adapters/ansible/roles/odl_cluster/templates
parentcf87d3067a63cb8be315a3addfd9c27d86be3b5a (diff)
Support OpenDayLight Lithium deployment
JIRA: COMPASS-35 Change-Id: I54763234ff4d708ae97e553372dd601fe9ea6fd4 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/odl_cluster/templates')
-rwxr-xr-x[-rw-r--r--]deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf0
-rwxr-xr-x[-rw-r--r--]deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh0
-rwxr-xr-x[-rw-r--r--]deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf0
-rwxr-xr-x[-rw-r--r--]deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf9
-rwxr-xr-x[-rw-r--r--]deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service0
-rwxr-xr-x[-rw-r--r--]deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg0
-rwxr-xr-x[-rw-r--r--]deploy/adapters/ansible/roles/odl_cluster/templates/tomcat-server.xml0
7 files changed, 5 insertions, 4 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf
index 318a8729..318a8729 100644..100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh
index 7f61d367..7f61d367 100644..100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf
index 9a5d4c38..9a5d4c38 100644..100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf
index c9a36f2e..d04cac22 100644..100755
--- 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
index a4adeeec..a4adeeec 100644..100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service
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
index 4f439c25..4f439c25 100644..100755
--- 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
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/tomcat-server.xml b/deploy/adapters/ansible/roles/odl_cluster/templates/tomcat-server.xml
index bc7ab13d..bc7ab13d 100644..100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/tomcat-server.xml
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/tomcat-server.xml