opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #605 from imphil/master

Browse source 
Install software-properties-common for xenial
This commit is contained in:
TP Honey 2016-05-03 11:36:27 +01:00
commit 39870ce984
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -420,8 +420,8 @@ Manages PPA repositories using `add-apt-repository`. Not supported on Debian.
* `package_name`: Names the package that provides the `apt-add-repository` command. Valid options: a string. Defaults:
* Lucid and Precise: 'python-software-properties'
* Trusty, Utopic, and Vivid: 'software-properties-common'
* All others: undef
* Trusty and newer: 'software-properties-common'
* All others: 'python-software-properties'
* `release`: *Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint).* Specifies the operating system of your node. Valid options: a string containing a valid LSB distribution codename. Default: "$lsbdistcodename".

13
manifests/params.pp
View file

@ -131,23 +131,18 @@ class apt::params {
'repos' => 'main universe multiverse restricted',
}
case $xfacts['lsbdistcodename'] {
'lucid': {
if $xfacts['lsbdistcodename'] == 'lucid' {
$ppa_options = undef
$ppa_package = 'python-software-properties'
}
'precise': {
} elsif $xfacts['lsbdistcodename'] == 'precise' {
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
}
'trusty', 'utopic', 'vivid', 'wily': {
} elsif versioncmp($xfacts['lsbdistrelease'], '14.04') >= 0 {
$ppa_options = '-y'
$ppa_package = 'software-properties-common'
}
default: {
} else {
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
}
}
}
undef: {

4
spec/classes/apt_backports_spec.rb
View file

@ -46,6 +46,7 @@ describe 'apt::backports', :type => :class do
:lsbdistid => 'Ubuntu',
:osfamily => 'Debian',
:lsbdistcodename => 'trusty',
:lsbdistrelease => '14.04',
:puppetversion => Puppet.version,
}
end
@ -64,6 +65,7 @@ describe 'apt::backports', :type => :class do
:lsbdistid => 'Ubuntu',
:osfamily => 'Debian',
:lsbdistcodename => 'trusty',
:lsbdistrelease => '14.04',
:puppetversion => Puppet.version,
}
end
@ -91,6 +93,7 @@ describe 'apt::backports', :type => :class do
:lsbdistid => 'Ubuntu',
:osfamily => 'Debian',
:lsbdistcodename => 'trusty',
:lsbdistrelease => '14.04',
:puppetversion => Puppet.version,
}
end
@ -201,6 +204,7 @@ describe 'apt::backports', :type => :class do
:lsbdistid => 'Ubuntu',
:osfamily => 'Debian',
:lsbdistcodename => 'trusty',
:lsbdistrelease => '14.04',
:puppetversion => Puppet.version,
}
end