Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

config.pp: move all defaults to params.pp #612

Merged
merged 2 commits into from
Jul 28, 2023
Merged

config.pp: move all defaults to params.pp #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2866437
r10k_yaml_template: move default to params.pp
bastelfreak Jul 28, 2023
403eea2
config: move postrun default to params.pp
bastelfreak Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down
4 changes: 2 additions & 2 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down