X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fparams.pp;h=57cee5007d65ee75a21f06c4a6afa4ec315db807;hb=43ab92c4768b638edada41b801091af1a839dfba;hp=e3cc8252f99ab34127b221080f5d7b2ffa80cdc0;hpb=2a289382997343db202f6e66aff15732f78993c6;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/params.pp b/manifests/params.pp index e3cc825..57cee50 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,9 +1,5 @@ class apt::params { - if defined('$caller_module_name') and $caller_module_name and $caller_module_name != $module_name { - fail('apt::params is a private class and cannot be accessed directly') - } - if $::osfamily != 'Debian' { fail('This module only works on Debian or derivatives like Ubuntu') } @@ -61,7 +57,6 @@ class apt::params { } $update_defaults = { - 'always' => false, 'frequency' => 'reluctantly', 'timeout' => undef, 'tries' => undef, @@ -112,6 +107,10 @@ class apt::params { } } } + 'Cumulus Networks': { + $distid = 'debian' + $distcodename = $::lsbdistcodename + } undef: { fail('Unable to determine lsbdistid, is lsb-release installed?') } @@ -136,7 +135,7 @@ class apt::params { } default: { $ppa_options = '-y' - $ppa_package = 'software-properties-common' + $ppa_package = 'python-software-properties' } } }