Merge pull request #109 from patcadelina/rundeck-config-template

(#108) Add support for customizing rundeck-config
voxpupuli · Oct 20, 2015 · 7301d7e · 7301d7e
2 parents 3895f5a + 2834f18
commit 7301d7e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -35,7 +35,8 @@
   $security_config       = $rundeck::security_config,
   $security_role         = $rundeck::security_role,
   $acl_policies          = $rundeck::acl_policies,
-  $api_policies          = $rundeck::api_policies
+  $api_policies          = $rundeck::api_policies,
+  $rdeck_config_template = $rundeck::rdeck_config_template,
 ) inherits rundeck::params {
 
   $framework_config = deep_merge($rundeck::params::framework_config, $rundeck::framework_config)

diff --git a/manifests/config/global/rundeck_config.pp b/manifests/config/global/rundeck_config.pp
@@ -7,16 +7,17 @@
 # This private class is called from rundeck::config used to manage the rundeck-config properties
 #
 class rundeck::config::global::rundeck_config(
-  $rd_loglevel         = $rundeck::config::loglevel,
-  $rdeck_base          = $rundeck::config::rdeck_base,
-  $rss_enabled         = $rundeck::config::rss_enabled,
-  $clustermode_enabled = $rundeck::config::clustermode_enabled,
-  $grails_server_url   = $rundeck::config::grails_server_url,
-  $properties_dir      = $rundeck::config::properties_dir,
-  $user                = $rundeck::config::user,
-  $group               = $rundeck::config::group,
-  $mail_config         = $rundeck::config::mail_config,
-  $security_config     = $rundeck::config::security_config
+  $rd_loglevel           = $rundeck::config::loglevel,
+  $rdeck_base            = $rundeck::config::rdeck_base,
+  $rss_enabled           = $rundeck::config::rss_enabled,
+  $clustermode_enabled   = $rundeck::config::clustermode_enabled,
+  $grails_server_url     = $rundeck::config::grails_server_url,
+  $properties_dir        = $rundeck::config::properties_dir,
+  $user                  = $rundeck::config::user,
+  $group                 = $rundeck::config::group,
+  $mail_config           = $rundeck::config::mail_config,
+  $security_config       = $rundeck::config::security_config,
+  $rdeck_config_template = $rundeck::config::rdeck_config_template,
 ) {
 
   $properties_file = "${properties_dir}/rundeck-config.groovy"
@@ -31,7 +32,7 @@
 
   file { $properties_file:
     ensure  => present,
-    content => template('rundeck/rundeck-config.erb'),
+    content => template($rdeck_config_template),
     owner   => $user,
     group   => $group,
     mode    => '0640',

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -152,6 +152,7 @@
   $jvm_args                     = $rundeck::params::jvm_args,
   $java_home                    = $rundeck::params::java_home,
   $rdeck_home                   = $rundeck::params::rdeck_home,
+  $rdeck_config_template        = $rundeck::params::rdeck_config_template,
 ) inherits rundeck::params {
 
   #validate_re($package_ensure, '\d+\.\d+\.\d+')

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -272,4 +272,6 @@
 
   $web_xml = "${rdeck_base}/exp/webapp/WEB-INF/web.xml"
   $security_role = 'user'
+
+  $rdeck_config_template = 'rundeck/rundeck-config.erb'
 }