Move all defaults to params

Author: Taylan Develioglu

manifests/init.pp

@@ -138,45 +138,45 @@
 #    }
 #  
 class consul (
-  $acls                  = {},
-  $arch                  = $consul::params::arch,
-  $archive_path          = '/opt/puppet-archive',
-  $bin_dir               = '/usr/local/bin',
-  $checks                = {},
-  $config_defaults       = {},
-  $config_dir            = '/etc/consul',
-  $config_hash           = {},
-  $config_mode           = $consul::params::config_mode,
-  $download_extension    = $consul::params::download_extension,
-  $download_url          = undef,
-  $download_url_base     = $consul::params::download_url_base,
-  $extra_groups          = [],
-  $extra_options         = '',
-  $group                 = 'consul',
-  $init_style            = $consul::params::init_style,
-  $install_method        = $consul::params::install_method,
-  $join_wan              = false,
-  $manage_group          = true,
-  $manage_service        = true,
-  $manage_user           = true,
-  $os                    = $consul::params::os,
-  $package_ensure        = $consul::params::package_ensure,
-  $package_name          = $consul::params::package_name,
-  $pretty_config         = false,
-  $pretty_config_indent  = 4,
-  $purge_config_dir      = true,
-  $restart_on_change     = true,
-  $service_enable        = true,
-  $service_ensure        = 'running',
-  $services              = {},
-  $ui_download_extension = $consul::params::ui_download_extension,
-  $ui_download_url       = undef,
-  $ui_download_url_base  = $consul::params::ui_download_url_base,
-  $ui_package_ensure     = $consul::params::ui_package_ensure,
-  $ui_package_name       = $consul::params::ui_package_name,
-  $user                  = 'consul',
-  $version               = $consul::params::version,
-  $watches               = {},
+  $acls                  = $::consul::params::acls,
+  $arch                  = $::consul::params::arch,
+  $archive_path          = $::consul::params::archive_path,
+  $bin_dir               = $::consul::params::bin_dir,
+  $checks                = $::consul::params::checks,
+  $config_defaults       = $::consul::params::config_defaults,
+  $config_dir            = $::consul::params::config_dir,
+  $config_hash           = $::consul::params::config_hash,
+  $config_mode           = $::consul::params::config_mode,
+  $download_extension    = $::consul::params::download_extension,
+  $download_url          = $::consul::params::download_url,
+  $download_url_base     = $::consul::params::download_url_base,
+  $extra_groups          = $::consul::params::extra_groups,
+  $extra_options         = $::consul::params::extra_options,
+  $group                 = $::consul::params::group,
+  $init_style            = $::consul::params::init_style,
+  $install_method        = $::consul::params::install_method,
+  $join_wan              = $::consul::params::join_wan,
+  $manage_group          = $::consul::params::manage_group,
+  $manage_service        = $::consul::params::manage_service,
+  $manage_user           = $::consul::params::manage_user,
+  $os                    = $::consul::params::os,
+  $package_ensure        = $::consul::params::package_ensure,
+  $package_name          = $::consul::params::package_name,
+  $pretty_config         = $::consul::params::pretty_config,
+  $pretty_config_indent  = $::consul::params::pretty_config_indent,
+  $purge_config_dir      = $::consul::params::purge_config_dir,
+  $restart_on_change     = $::consul::params::restart_on_change,
+  $service_enable        = $::consul::params::service_enable,
+  $service_ensure        = $::consul::params::service_ensure,
+  $services              = $::consul::params::services,
+  $ui_download_extension = $::consul::params::ui_download_extension,
+  $ui_download_url       = $::consul::params::ui_download_url,
+  $ui_download_url_base  = $::consul::params::ui_download_url_base,
+  $ui_package_ensure     = $::consul::params::ui_package_ensure,
+  $ui_package_name       = $::consul::params::ui_package_name,
+  $user                  = $::consul::params::user,
+  $version               = $::consul::params::version,
+  $watches               = $::consul::params::watches,
 ) inherits consul::params {
 
   # lint:ignore:140chars

manifests/params.pp

@@ -4,18 +4,42 @@
 # It sets variables according to platform
 #
 class consul::params {
-
+  $acls                  = {}
+  $archive_path          = '/opt/puppet-archive'
+  $bin_dir               = '/usr/local/bin'
+  $checks                = {}
+  $config_defaults       = {}
+  $config_dir            = '/etc/consul'
+  $config_hash           = {}
   $config_mode           = '0660'
   $download_extension    = 'zip'
+  $download_url          = undef
   $download_url_base     = 'https://releases.hashicorp.com/consul/'
+  $extra_groups          = []
+  $extra_options         = ''
+  $group                 = 'consul'
   $install_method        = 'url'
+  $join_wan              = false
+  $manage_group          = true
+  $manage_service        = true
+  $manage_user           = true
   $package_ensure        = 'latest'
   $package_name          = 'consul'
+  $pretty_config         = false
+  $pretty_config_indent  = 4
+  $purge_config_dir      = true
+  $restart_on_change     = true
+  $service_enable        = true
+  $service_ensure        = 'running'
+  $services              = {}
   $ui_download_extension = 'zip'
+  $ui_download_url       = undef
   $ui_download_url_base  = 'https://releases.hashicorp.com/consul/'
   $ui_package_ensure     = 'latest'
   $ui_package_name       = 'consul_ui'
+  $user                  = 'consul'
   $version               = '0.5.2'
+  $watches               = {}
 
   case $::architecture {
     'x86_64', 'amd64': { $arch = 'amd64' }