Skip to content

Commit

Permalink
deploy settings: generate types by default and dont deploy spec dir
Browse files Browse the repository at this point in the history
for a long time r10k supports generating types. It's not required to do
this in a custom posthook. Also r10k has an option to ignore the spec
dir from modules. To provide a good user experience we should enable it.

This was introduced in r10k 3.11: https://github.com/puppetlabs/r10k/blob/main/CHANGELOG.mkd#3110
  • Loading branch information
bastelfreak committed Jul 28, 2023
1 parent 26f77eb commit bf161a9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ Data type: `Hash`



Default value: `$r10k::params::deploy_settings`
Default value: `{ 'generate_types' => true, 'exclude_spec' => true, }`

##### <a name="-r10k--root_user"></a>`root_user`

Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
$configfile_symlink = $r10k::params::configfile_symlink,
Hash $git_settings = $r10k::params::git_settings,
Hash $forge_settings = $r10k::params::forge_settings,
Hash $deploy_settings = $r10k::params::deploy_settings,
Hash $deploy_settings = { 'generate_types' => true, 'exclude_spec' => true, },
$root_user = $r10k::params::root_user,
Optional[String[1]] $proxy = $r10k::params::proxy,
Optional[Integer[1]] $pool_size = $r10k::params::pool_size,
Expand Down
1 change: 0 additions & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
$configfile_symlink = '/etc/r10k.yaml'
$git_settings = {}
$forge_settings = {}
$deploy_settings = {}
# Git configuration
$git_server = $settings::ca_server #lint:ignore:top_scope_facts
$repo_path = '/var/repos'
Expand Down

0 comments on commit bf161a9

Please sign in to comment.