diff --git a/manifests/init.pp b/manifests/init.pp index 20e84025..820a087a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -52,6 +52,8 @@ # Set to true to enable clustered mode (JIRA Datacenter) # @param shared_homedir # Shared data directory for all JIRA instances in a cluster +# @param node_id +# sets the unique nodeid for JIEA Datacenter. Defaults to fqdn # @param ehcache_listener_host # EHCache configuration for clustered mode # @param ehcache_listener_port @@ -305,6 +307,7 @@ Hash $jira_config_properties = {}, Boolean $datacenter = false, Optional[Stdlib::AbsolutePath] $shared_homedir = undef, + String $node_id = $facts['networking']['fqdn'], Optional[Stdlib::Host] $ehcache_listener_host = undef, Optional[Stdlib::Port] $ehcache_listener_port = undef, Optional[Stdlib::Port] $ehcache_object_port = undef, @@ -517,7 +520,7 @@ true => { password => $plugin_data['password'] } } $_plugin_archive = { - $target => $_target_defaults + $_username + $_password + $target => $_target_defaults + $_username + $_password, } create_resources(archive, $_plugin_archive) } diff --git a/templates/cluster.properties.epp b/templates/cluster.properties.epp index 38c50cdc..08a76fb6 100644 --- a/templates/cluster.properties.epp +++ b/templates/cluster.properties.epp @@ -1,5 +1,5 @@ # This ID must be unique across the cluster -jira.node.id = <%= $facts['fqdn'] %> +jira.node.id = <%= $jira::node_id %> # The location of the shared home directory for all JIRA nodes jira.shared.home = <%= $jira::shared_homedir %> <% if $jira::ehcache_listener_host { -%>