diff --git a/REFERENCE.md b/REFERENCE.md index ac9556ce..62582a2a 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -475,11 +475,11 @@ Default value: `$r10k::params::deploy_settings` ##### `postrun` -Data type: `Optional[Array]` +Data type: `Array[String[1]]` -Default value: `undef` +Default value: `$r10k::params::postrun` ##### `root_user` @@ -527,7 +527,7 @@ Data type: `String` -Default value: `'r10k/r10k.yaml.erb'` +Default value: `$r10k::params::r10k_yaml_template` ### `r10k::install` diff --git a/manifests/config.pp b/manifests/config.pp index 881a1f32..23e630b6 100644 --- a/manifests/config.pp +++ b/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 = { diff --git a/manifests/params.pp b/manifests/params.pp index 20e06738..d9acbe6d 100644 --- a/manifests/params.pp +++ b/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