Merge pull request #648 from bastelfreak/foo

move static data from params.pp to init.pp

Author: bastelfreak

manifests/init.pp

@@ -37,27 +37,27 @@
 #   }
 #
 class python (
-  Python::Package::Ensure    $ensure                      = $python::params::ensure,
+  Python::Package::Ensure    $ensure                      = 'present',
   Python::Version            $version                     = $facts['os']['family'] ? { 'Archlinux' => 'system', default => '3' },
-  Python::Package::Ensure    $pip                         = $python::params::pip,
-  Python::Package::Ensure    $dev                         = $python::params::dev,
-  Python::Package::Ensure    $venv                        = $python::params::venv,
-  Python::Package::Ensure    $gunicorn                    = $python::params::gunicorn,
-  Boolean                    $manage_gunicorn             = $python::params::manage_gunicorn,
-  Boolean                    $manage_python_package       = $python::params::manage_python_package,
+  Python::Package::Ensure    $pip                         = 'present',
+  Python::Package::Ensure    $dev                         = 'absent',
+  Python::Package::Ensure    $venv                        = 'absent',
+  Python::Package::Ensure    $gunicorn                    = 'absent',
+  Boolean                    $manage_gunicorn             = true,
+  Boolean                    $manage_python_package       = true,
   Boolean                    $manage_venv_package         = $python::params::manage_venv_package,
   Boolean                    $manage_pip_package          = $python::params::manage_pip_package,
   String[1]                  $gunicorn_package_name       = $python::params::gunicorn_package_name,
-  Optional[Python::Provider] $provider                    = $python::params::provider,
+  Optional[Python::Provider] $provider                    = undef,
   Hash                       $python_pips                 = {},
   Hash                       $python_pyvenvs              = {},
   Hash                       $python_requirements         = {},
   Hash                       $python_dotfiles             = {},
   Boolean                    $use_epel                    = $python::params::use_epel,
-  Boolean                    $rhscl_use_public_repository = $python::params::rhscl_use_public_repository,
-  Stdlib::Httpurl            $anaconda_installer_url      = $python::params::anaconda_installer_url,
-  Stdlib::Absolutepath       $anaconda_install_path       = $python::params::anaconda_install_path,
-  Boolean                    $manage_scl                  = $python::params::manage_scl,
+  Boolean                    $rhscl_use_public_repository = true,
+  Stdlib::Httpurl            $anaconda_installer_url      = 'https://repo.anaconda.com/archive/Anaconda3-5.2.0-Linux-x86_64.sh',
+  Stdlib::Absolutepath       $anaconda_install_path       = '/opt/python',
+  Boolean                    $manage_scl                  = true,
   Optional[Python::Umask]    $umask                       = undef,
 ) inherits python::params {
   $exec_prefix = $provider ? {

manifests/params.pp

@@ -9,20 +9,6 @@
     fail("Module is not compatible with ${facts['os']['name']}")
   }
 
-  $ensure                      = 'present'
-  $pip                         = 'present'
-  $dev                         = 'absent'
-  $venv                        = 'absent'
-  $gunicorn                    = 'absent'
-  $manage_gunicorn             = true
-  $manage_python_package       = true
-  $provider                    = undef
-  $valid_versions              = undef
-  $manage_scl                  = true
-  $rhscl_use_public_repository = true
-  $anaconda_installer_url      = 'https://repo.anaconda.com/archive/Anaconda3-5.2.0-Linux-x86_64.sh'
-  $anaconda_install_path       = '/opt/python'
-
   if $facts['os']['family'] == 'RedHat' and $facts['os']['name'] != 'Fedora' {
     $use_epel = true
   } else {