Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #483 from mhaskel/examples
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
params.pp
diff --git
a/manifests/params.pp
b/manifests/params.pp
index 42dd6b01290bae1783aadccaaae56eb84708f572..57cee5007d65ee75a21f06c4a6afa4ec315db807 100644
(file)
--- a/
manifests/params.pp
+++ b/
manifests/params.pp
@@
-1,9
+1,5
@@
class apt::params {
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')
}
if $::osfamily != 'Debian' {
fail('This module only works on Debian or derivatives like Ubuntu')
}
@@
-61,7
+57,6
@@
class apt::params {
}
$update_defaults = {
}
$update_defaults = {
- 'always' => false,
'frequency' => 'reluctantly',
'timeout' => undef,
'tries' => undef,
'frequency' => 'reluctantly',
'timeout' => undef,
'tries' => undef,
@@
-87,6
+82,11
@@
class apt::params {
'source' => undef,
}
'source' => undef,
}
+ $include_defaults = {
+ 'deb' => true,
+ 'src' => false,
+ }
+
case $xfacts['lsbdistid'] {
'ubuntu', 'debian': {
$distid = $xfacts['lsbdistid']
case $xfacts['lsbdistid'] {
'ubuntu', 'debian': {
$distid = $xfacts['lsbdistid']
@@
-107,6
+107,10
@@
class apt::params {
}
}
}
}
}
}
+ 'Cumulus Networks': {
+ $distid = 'debian'
+ $distcodename = $::lsbdistcodename
+ }
undef: {
fail('Unable to determine lsbdistid, is lsb-release installed?')
}
undef: {
fail('Unable to determine lsbdistid, is lsb-release installed?')
}
@@
-131,7
+135,7
@@
class apt::params {
}
default: {
$ppa_options = '-y'
}
default: {
$ppa_options = '-y'
- $ppa_package = '
software-properties-common
'
+ $ppa_package = '
python-software-properties
'
}
}
}
}
}
}