Merge pull request #612 from bastelfreak/bar

config.pp: move all defaults to params.pp

REFERENCE.md

@@ -475,11 +475,11 @@ Default value: `$r10k::params::deploy_settings`
 
 ##### <a name="-r10k--config--postrun"></a>`postrun`
 
-Data type: `Optional[Array]`
+Data type: `Array[String[1]]`
 
 
 
-Default value: `undef`
+Default value: `$r10k::params::postrun`
 
 ##### <a name="-r10k--config--root_user"></a>`root_user`
 
@@ -527,7 +527,7 @@ Data type: `String`
 
 
 
-Default value: `'r10k/r10k.yaml.erb'`
+Default value: `$r10k::params::r10k_yaml_template`
 
 ### <a name="r10k--install"></a>`r10k::install`
 

manifests/config.pp

@@ -64,13 +64,13 @@
   Hash $git_settings                        = $r10k::params::git_settings,
   Hash $forge_settings                      = $r10k::params::forge_settings,
   Hash $deploy_settings                     = $r10k::params::deploy_settings,
-  Optional[Array] $postrun                  = undef,
+  Array[String[1]] $postrun                 = $r10k::params::postrun,
   $root_user                                = $r10k::params::root_user,
   $root_group                               = $r10k::params::root_group,
   Stdlib::Absolutepath $puppetconf_path     = $r10k::params::puppetconf_path,
   Optional[String[1]] $proxy                = $r10k::params::proxy,
   Optional[Integer[1]] $pool_size           = $r10k::params::pool_size,
-  String $r10k_yaml_template                = 'r10k/r10k.yaml.erb',
+  String $r10k_yaml_template                = $r10k::params::r10k_yaml_template,
 ) inherits r10k::params {
   if $sources == undef {
     $r10k_sources  = {

manifests/params.pp

@@ -1,5 +1,7 @@
 # Reasonable defaults for all classes
 class r10k::params {
+  $postrun                = []
+  $r10k_yaml_template     = 'r10k/r10k.yaml.erb'
   $package_name           = ''
   $version                = 'installed'
   $manage_modulepath      = false