tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

library/roles/tomcat-multiple-instances: The java heap is now set by an ad hoc variable.

This commit is contained in:
Andrea Dell'Amico 2016-11-16 11:41:29 +01:00
parent 4b9201e6f5
commit 89e8005016
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tomcat-multiple-instances/defaults/main.yml
View File

@ -22,7 +22,9 @@ tomcat_m_heap_size: '{{ tomcat_m_min_heap_size }}'
tomcat_m_permgen_size: 512m
tomcat_m_restart_timeout: 300
# -server -Djava.awt.headless=true are always used. No need to specify them
tomcat_m_java_opts: "-Xms{{ tomcat_m_min_heap_size }} -Xmx{{ tomcat_m_heap_size }} -XX:MaxPermSize={{ tomcat_m_permgen_size }}"
tomcat_m_java_opts_heap: "-Xms{{ tomcat_m_min_heap_size }} -Xmx{{ tomcat_m_heap_size }}"
tomcat_m_java_opts_permgen: "-XX:MaxPermSize={{ tomcat_m_permgen_size }}"
tomcat_m_java_opts: "{{ tomcat_m_java_opts_heap }} {{ tomcat_m_java_opts_permgen }}"
tomcat_m_java_gc_opts: "-XX:+UseConcMarkSweepGC"
# Use "-XX:+UseConcMarkSweepGC" to enable the CMS garbage collector (improved
# response time). If you use that option and you run Tomcat on a machine with

7
tomcat-multiple-instances/templates/tomcat-default.j2
View File

@ -2,8 +2,13 @@ TOMCAT_USER={{ item.user }}
TOMCAT_GROUP={{ item.user }}
JAVA_HOME={{ item.java_home }}
JAVA_OPTS="-server -Djava.awt.headless=true"
{% if item.java_heap is defined %}
JAVA_HEAP="{{ item.java_heap }}"
{% else %}
JAVA_HEAP="{{ tomcat_m_java_opts_heap }}"
{% endif %}
{% if item.java_opts is defined %}
JAVA_OPTS="{{ item.java_opts }} $JAVA_OPTS"
JAVA_OPTS="{{ item.java_opts }} $JAVA_OPTS $JAVA_HEAP"
{% endif %}
{% if item.java_gc_opts is defined %}
JAVA_OPTS="{{ item.java_gc_opts }} $JAVA_OPTS"