From 364d6ed86441810aaf0c67bd7a124fc39af4f7d9 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Thu, 17 Nov 2016 14:49:06 +0100
Subject: [PATCH] 
 library/roles/tomcat-multiple-instances/templates/tomcat-default.j2: Set a
 default for the tomcat jmx port.

---
 tomcat-multiple-instances/templates/tomcat-default.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tomcat-multiple-instances/templates/tomcat-default.j2 b/tomcat-multiple-instances/templates/tomcat-default.j2
index 86ecf1b..fbed83f 100644
--- a/tomcat-multiple-instances/templates/tomcat-default.j2
+++ b/tomcat-multiple-instances/templates/tomcat-default.j2
@@ -17,7 +17,7 @@ JAVA_OPTS="{{ item.java_gc_opts }} $JAVA_OPTS"
 JAVA_OPTS="${JAVA_OPTS} {{ item.other_java_opts }}"
 {% endif %}
 {% if item.jmx_enabled is defined and item.jmx_enabled %}
-JAVA_OPTS="${JAVA_OPTS} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port={{ item.jmx_port }}"
+JAVA_OPTS="${JAVA_OPTS} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port={{ item.jmx_port | default('tomcat_m_jmx_port') }}"
 {% if item.jmx_use_ssl is defined and item.jmx_use_ssl %}
 JAVA_OPTS="${JAVA_OPTS} -Dcom.sun.management.jmxremote.ssl=true"
 {% else %}