Merge pull request #609 from bastelfreak/deploy

deploy settings: generate types by default and dont deploy spec dir
voxpupuli · Jul 29, 2023 · bcce4c4 · bcce4c4
2 parents 1fa0240 + c5f874d
commit bcce4c4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -227,7 +227,7 @@ Default value: `$r10k::params::forge_settings`
 
 ##### <a name="-r10k--deploy_settings"></a>`deploy_settings`
 
-Data type: `Optional[Hash]`
+Data type: `Hash`
 
 
 
@@ -466,7 +466,7 @@ Default value: `$r10k::params::forge_settings`
 
 ##### <a name="-r10k--config--deploy_settings"></a>`deploy_settings`
 
-Data type: `Optional[Hash]`
+Data type: `Hash`
 
 
 

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -63,7 +63,7 @@
   Stdlib::Absolutepath $configfile_symlink  = $r10k::params::configfile_symlink,
   Optional[Hash] $git_settings              = $r10k::params::git_settings,
   Optional[Hash] $forge_settings            = $r10k::params::forge_settings,
-  Optional[Hash] $deploy_settings           = $r10k::params::deploy_settings,
+  Hash $deploy_settings                     = $r10k::params::deploy_settings,
   Optional[Array[String[1]]] $postrun       = $r10k::params::postrun,
   $root_user                                = $r10k::params::root_user,
   $root_group                               = $r10k::params::root_group,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -19,7 +19,7 @@
   $configfile_symlink                                         = $r10k::params::configfile_symlink,
   Optional[Hash] $git_settings                                = $r10k::params::git_settings,
   Optional[Hash] $forge_settings                              = $r10k::params::forge_settings,
-  Optional[Hash] $deploy_settings                             = $r10k::params::deploy_settings,
+  Hash $deploy_settings                                       = $r10k::params::deploy_settings,
   $root_user                                                  = $r10k::params::root_user,
   Optional[String[1]] $proxy                                  = $r10k::params::proxy,
   Optional[Integer[1]] $pool_size                             = $r10k::params::pool_size,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -35,7 +35,7 @@
   $configfile_symlink        = '/etc/r10k.yaml'
   $git_settings              = undef
   $forge_settings            = undef
-  $deploy_settings           = undef
+  $deploy_settings           = { 'generate_types' => true, 'exclude_spec' => true, }
   # Git configuration
   $git_server = $settings::ca_server #lint:ignore:top_scope_facts
   $repo_path  = '/var/repos'