Merge pull request #477 from bwitt/add-jvm-route

Add jvm_route param

Author: bastelfreak

REFERENCE.md

@@ -139,6 +139,7 @@ The following parameters are available in the `jira` class:
 * [`tomcat_address`](#-jira--tomcat_address)
 * [`tomcat_port`](#-jira--tomcat_port)
 * [`tomcat_shutdown_port`](#-jira--tomcat_shutdown_port)
+* [`jvm_route`](#-jira--jvm_route)
 * [`tomcat_max_http_header_size`](#-jira--tomcat_max_http_header_size)
 * [`tomcat_min_spare_threads`](#-jira--tomcat_min_spare_threads)
 * [`tomcat_connection_timeout`](#-jira--tomcat_connection_timeout)
@@ -832,6 +833,14 @@ Tomcat shutdown command port
 
 Default value: `8005`
 
+##### <a name="-jira--jvm_route"></a>`jvm_route`
+
+Data type: `Optional[String[1]]`
+
+The jvmRoute to use for load balancing
+
+Default value: `undef`
+
 ##### <a name="-jira--tomcat_max_http_header_size"></a>`tomcat_max_http_header_size`
 
 Data type: `Integer`

manifests/init.pp

@@ -180,6 +180,8 @@
 #   Tomcat bind port
 # @param tomcat_shutdown_port
 #   Tomcat shutdown command port
+# @param jvm_route
+#   The jvmRoute to use for load balancing
 # @param tomcat_max_http_header_size
 #   Tomcat connector setting
 # @param tomcat_min_spare_threads
@@ -387,6 +389,7 @@
   Optional[String] $tomcat_address                                  = undef,
   Stdlib::Port $tomcat_port                                         = 8080,
   Stdlib::Port $tomcat_shutdown_port                                = 8005,
+  Optional[String[1]] $jvm_route                                    = undef,
   Integer $tomcat_max_http_header_size                              = 8192,
   Integer[0] $tomcat_min_spare_threads                              = 25,
   Integer[0] $tomcat_connection_timeout                             = 20000,

spec/classes/jira_config_spec.rb

@@ -112,6 +112,23 @@ def self.clear_cache
             end
           end
 
+          context 'with jvm_route' do
+            let(:params) do
+              {
+                javahome: '/opt/java',
+                version: DEFAULT_VERSION,
+                jvm_route: 'node1',
+              }
+            end
+
+            it { is_expected.to compile.with_all_deps }
+
+            it 'configures jvmRoute in server.xml' do
+              is_expected.to contain_file(FILENAME_SERVER_XML).
+                with_content(%r{<Engine name="Catalina" defaultHost="localhost" jvmRoute="node1">})
+            end
+          end
+
           context 'with custom session_timeout' do
             let(:params) do
               {

templates/server.xml.epp

@@ -108,7 +108,7 @@
 <% } -%>
                    />
 <% } -%>
-        <Engine name="Catalina" defaultHost="localhost">
+        <Engine name="Catalina" defaultHost="localhost"<% if $jira::jvm_route { %> jvmRoute="<%= $jira::jvm_route %>"<% } %>>
             <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
 
                 <Context path="<%= $jira::contextpath %>" docBase="${catalina.home}/atlassian-jira" reloadable="false" useHttpOnly="true">