r10k::config: inherit from main class, not params

voxpupuli · Jul 28, 2023 · 66cd2f7 · 66cd2f7
1 parent 26f77eb
commit 66cd2f7
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -52,26 +52,26 @@
 # Charlie Sharpsteen <source@sharpsteen.net>
 # Zack Smith <zack@puppetlabs.com>
 class r10k::config (
-  $configfile                               = $r10k::params::r10k_config_file,
-  $cachedir                                 = $r10k::params::r10k_cache_dir,
-  Optional[Hash] $sources                   = $r10k::params::sources,
-  $modulepath                               = $r10k::params::modulepath,
-  $remote                                   = $r10k::params::remote,
-  Boolean $manage_modulepath                = $r10k::params::manage_modulepath,
-  Stdlib::Absolutepath $r10k_basedir        = $r10k::params::r10k_basedir,
-  Boolean $manage_configfile_symlink        = $r10k::params::manage_configfile_symlink,
-  Stdlib::Absolutepath $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,
+  $configfile                               = $r10k::r10k_config_file,
+  $cachedir                                 = $r10k::r10k_cache_dir,
+  Optional[Hash] $sources                   = $r10k::sources,
+  $modulepath                               = $r10k::modulepath,
+  $remote                                   = $r10k::remote,
+  Boolean $manage_modulepath                = $r10k::manage_modulepath,
+  Stdlib::Absolutepath $r10k_basedir        = $r10k::r10k_basedir,
+  Boolean $manage_configfile_symlink        = $r10k::manage_configfile_symlink,
+  Stdlib::Absolutepath $configfile_symlink  = $r10k::configfile_symlink,
+  Hash $git_settings                        = $r10k::git_settings,
+  Hash $forge_settings                      = $r10k::forge_settings,
+  Hash $deploy_settings                     = $r10k::deploy_settings,
   Optional[Array] $postrun                  = undef,
-  $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,
+  $root_user                                = $r10k::root_user,
+  $root_group                               = $r10k::root_group,
+  Stdlib::Absolutepath $puppetconf_path     = $r10k::puppetconf_path,
+  Optional[String[1]] $proxy                = $r10k::proxy,
+  Optional[Integer[1]] $pool_size           = $r10k::pool_size,
   String $r10k_yaml_template                = 'r10k/r10k.yaml.erb',
-) inherits r10k::params {
+) inherits r10k {
   if $sources == undef {
     $r10k_sources  = {
       'puppet' => {