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

REFERENCE.md

@@ -383,95 +383,95 @@ Data type: `Any`
 
 
 
-Default value: `$r10k::params::r10k_config_file`
+Default value: `$r10k::r10k_config_file`
 
 ##### <a name="-r10k--config--cachedir"></a>`cachedir`
 
 Data type: `Any`
 
 
 
-Default value: `$r10k::params::r10k_cache_dir`
+Default value: `$r10k::r10k_cache_dir`
 
 ##### <a name="-r10k--config--sources"></a>`sources`
 
 Data type: `Optional[Hash]`
 
 
 
-Default value: `$r10k::params::sources`
+Default value: `$r10k::sources`
 
 ##### <a name="-r10k--config--modulepath"></a>`modulepath`
 
 Data type: `Any`
 
 
 
-Default value: `$r10k::params::modulepath`
+Default value: `$r10k::modulepath`
 
 ##### <a name="-r10k--config--remote"></a>`remote`
 
 Data type: `Any`
 
 
 
-Default value: `$r10k::params::remote`
+Default value: `$r10k::remote`
 
 ##### <a name="-r10k--config--manage_modulepath"></a>`manage_modulepath`
 
 Data type: `Boolean`
 
 
 
-Default value: `$r10k::params::manage_modulepath`
+Default value: `$r10k::manage_modulepath`
 
 ##### <a name="-r10k--config--r10k_basedir"></a>`r10k_basedir`
 
 Data type: `Stdlib::Absolutepath`
 
 
 
-Default value: `$r10k::params::r10k_basedir`
+Default value: `$r10k::r10k_basedir`
 
 ##### <a name="-r10k--config--manage_configfile_symlink"></a>`manage_configfile_symlink`
 
 Data type: `Boolean`
 
 
 
-Default value: `$r10k::params::manage_configfile_symlink`
+Default value: `$r10k::manage_configfile_symlink`
 
 ##### <a name="-r10k--config--configfile_symlink"></a>`configfile_symlink`
 
 Data type: `Stdlib::Absolutepath`
 
 
 
-Default value: `$r10k::params::configfile_symlink`
+Default value: `$r10k::configfile_symlink`
 
 ##### <a name="-r10k--config--git_settings"></a>`git_settings`
 
 Data type: `Hash`
 
 
 
-Default value: `$r10k::params::git_settings`
+Default value: `$r10k::git_settings`
 
 ##### <a name="-r10k--config--forge_settings"></a>`forge_settings`
 
 Data type: `Hash`
 
 
 
-Default value: `$r10k::params::forge_settings`
+Default value: `$r10k::forge_settings`
 
 ##### <a name="-r10k--config--deploy_settings"></a>`deploy_settings`
 
 Data type: `Hash`
 
 
 
-Default value: `$r10k::params::deploy_settings`
+Default value: `$r10k::deploy_settings`
 
 ##### <a name="-r10k--config--postrun"></a>`postrun`
 
@@ -487,39 +487,39 @@ Data type: `Any`
 
 
 
-Default value: `$r10k::params::root_user`
+Default value: `$r10k::root_user`
 
 ##### <a name="-r10k--config--root_group"></a>`root_group`
 
 Data type: `Any`
 
 
 
-Default value: `$r10k::params::root_group`
+Default value: `$r10k::root_group`
 
 ##### <a name="-r10k--config--puppetconf_path"></a>`puppetconf_path`
 
 Data type: `Stdlib::Absolutepath`
 
 
 
-Default value: `$r10k::params::puppetconf_path`
+Default value: `$r10k::puppetconf_path`
 
 ##### <a name="-r10k--config--proxy"></a>`proxy`
 
 Data type: `Optional[String[1]]`
 
 
 
-Default value: `$r10k::params::proxy`
+Default value: `$r10k::proxy`
 
 ##### <a name="-r10k--config--pool_size"></a>`pool_size`
 
 Data type: `Optional[Integer[1]]`
 
 
 
-Default value: `$r10k::params::pool_size`
+Default value: `$r10k::pool_size`
 
 ##### <a name="-r10k--config--r10k_yaml_template"></a>`r10k_yaml_template`
 

manifests/config.pp

@@ -52,26 +52,26 @@
 # Charlie Sharpsteen <[email protected]>
 # Zack Smith <[email protected]>
 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' => {