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
Install software-properties-common for xenial
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
params.pp
diff --git
a/manifests/params.pp
b/manifests/params.pp
index cdf8e6e09f2e64e74f6a0dd07c05578fbcc631a6..179e2d631114b1c242679f728db3d7017181018a 100644
(file)
--- a/
manifests/params.pp
+++ b/
manifests/params.pp
@@
-61,7
+61,7
@@
class apt::params {
},
'pref' => {
'path' => $preferences_d,
},
'pref' => {
'path' => $preferences_d,
- 'ext' => '',
+ 'ext' => '
.pref
',
},
'list' => {
'path' => $sources_list_d,
},
'list' => {
'path' => $sources_list_d,
@@
-76,9
+76,10
@@
class apt::params {
}
$proxy_defaults = {
}
$proxy_defaults = {
- 'host' => undef,
- 'port' => 8080,
- 'https' => false,
+ 'ensure' => undef,
+ 'host' => undef,
+ 'port' => 8080,
+ 'https' => false,
}
$purge_defaults = {
}
$purge_defaults = {
@@
-130,23
+131,18
@@
class apt::params {
'repos' => 'main universe multiverse restricted',
}
'repos' => 'main universe multiverse restricted',
}
- case $xfacts['lsbdistcodename'] {
- 'lucid': {
+ if $xfacts['lsbdistcodename'] == 'lucid' {
$ppa_options = undef
$ppa_package = 'python-software-properties'
$ppa_options = undef
$ppa_package = 'python-software-properties'
- }
- 'precise': {
+ } elsif $xfacts['lsbdistcodename'] == 'precise' {
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
- }
- 'trusty', 'utopic', 'vivid': {
+ } elsif versioncmp($xfacts['lsbdistrelease'], '14.04') >= 0 {
$ppa_options = '-y'
$ppa_package = 'software-properties-common'
$ppa_options = '-y'
$ppa_package = 'software-properties-common'
- }
- default: {
+ } else {
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
- }
}
}
undef: {
}
}
undef: {