Move apt class parameters to a ::params class.

This brings no behaviour change yet, but will allow to set class parameters'
default value depending on system facts.

diff --git a/manifests/init.pp b/manifests/init.pp
index 5722c6af9566b2c8107f3d72a164832d04457e8f..3f8e1c8655fbf1fa91de179ac8cc27cf2ad4a2b0 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,19 +4,19 @@
 # See LICENSE for the full license granted to you.
 
 class apt(
-  $codename = $::lsbdistcodename,
-  $use_volatile = false,
-  $include_src = false,
-  $use_next_release = false,
-  $debian_url = 'http://http.debian.net/debian/',
-  $security_url = 'http://security.debian.org/',
-  $backports_url = 'http://backports.debian.org/debian-backports/',
-  $volatile_url = 'http://volatile.debian.org/debian-volatile/',
-  $ubuntu_url = 'http://archive.ubuntu.com/ubuntu',
-  $repos = 'auto',
-  $custom_preferences = '',
-  $disable_update = false
-){
+  $codename = $apt::params::codename,
+  $use_volatile = $apt::params::use_volatile,
+  $include_src = $apt::params::include_src,
+  $use_next_release = $apt::params::use_next_release,
+  $debian_url = $apt::params::debian_url,
+  $security_url = $apt::params::security_url,
+  $backports_url = $apt::params::backports_url,
+  $volatile_url = $apt::params::volatile_url,
+  $ubuntu_url = $apt::params::ubuntu_url,
+  $repos = $apt::params::repos,
+  $custom_preferences = $apt::params::custom_preferences,
+  $disable_update = $apt::params::disable_update
+) inherits apt::params {
   case $::operatingsystem {
     'debian': {
       $real_repos = $repos ? {

diff --git a/manifests/params.pp b/manifests/params.pp
new file mode 100644 (file)
index 0000000..f71570b
--- /dev/null
+++ b/manifests/params.pp
@@ -0,0 +1,14 @@
+class apt::params () {
+  $codename = $::lsbdistcodename
+  $use_volatile = false
+  $include_src = false
+  $use_next_release = false
+  $debian_url = 'http://http.debian.net/debian/'
+  $security_url = 'http://security.debian.org/'
+  $backports_url = 'http://backports.debian.org/debian-backports/'
+  $volatile_url = 'http://volatile.debian.org/debian-volatile/'
+  $ubuntu_url = 'http://archive.ubuntu.com/ubuntu'
+  $repos = 'auto'
+  $custom_preferences = ''
+  $disable_update = false
+}