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

Merge pull request #433 from mhaskel/ppa

Browse source 
PPA Cleanup, pt 1
This commit is contained in:
Daniele Sluijters 2015-02-23 20:21:10 +01:00
commit cddf5498f0
3 changed files with 40 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
manifests/params.pp
View file

@ -64,12 +64,19 @@ class apt::params {
case $distcodename {
'lucid': {
$ppa_options = undef
$ppa_package = 'python-software-properties'
}
'precise', 'trusty', 'utopic', 'vivid': {
'precise': {
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
}
'trusty', 'utopic', 'vivid': {
$ppa_options = '-y'
$ppa_package = 'software-properties-common'
}
default: {
$ppa_options = '-y'
$ppa_package = 'software-properties-common'
}
}
}

37
manifests/ppa.pp
View file

@ -3,8 +3,9 @@ define apt::ppa(
$ensure = 'present',
$release = $::lsbdistcodename,
$options = $::apt::ppa_options,
$package_name = $::apt::ppa_package,
$package_manage = false,
) {
if ! $release {
fail('lsbdistcodename fact not available: release parameter required')
}
@ -19,40 +20,31 @@ define apt::ppa(
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
if $ensure == 'present' {
$package = $::lsbdistrelease ? {
/^[1-9]\..*|1[01]\..*|12.04$/ => 'python-software-properties',
default => 'software-properties-common',
if $package_manage {
package { $package_name: }
$_require = [File['sources.list.d'], Package[$package_name]]
} else {
$_require = File['sources.list.d']
}
if ! defined(Package[$package]) {
package { $package: }
}
if defined(Class[apt]) {
$proxy_host = $apt::proxy_host
$proxy_port = $apt::proxy_port
case $proxy_host {
case $::apt::proxy_host {
false, '', undef: {
$proxy_env = []
$_proxy_env = []
}
default: {
$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]
$_proxy_env = ["http_proxy=http://${::apt::proxy_host}:${::apt::proxy_port}", "https_proxy=http://${::apt::proxy_host}:${::apt::proxy_port}"]
}
}
} else {
$proxy_env = []
}
exec { "add-apt-repository-${name}":
environment => $proxy_env,
environment => $_proxy_env,
command => "/usr/bin/add-apt-repository ${options} ${name}",
unless => "/usr/bin/test -s ${::apt::sources_list_d}/${sources_list_d_filename}",
user => 'root',
logoutput => 'on_failure',
notify => Exec['apt_update'],
require => [
File['sources.list.d'],
Package[$package],
],
require => $_require,
}
file { "${::apt::sources_list_d}/${sources_list_d_filename}":
@ -61,7 +53,6 @@ define apt::ppa(
}
}
else {
file { "${::apt::sources_list_d}/${sources_list_d_filename}":
ensure => 'absent',
notify => Exec['apt_update'],

13
spec/defines/ppa_spec.rb
View file

@ -16,7 +16,7 @@ describe 'apt::ppa', :type => :define do
end
let(:title) { 'ppa:needs/such.substitution/wow' }
it { is_expected.to contain_package('python-software-properties') }
it { is_expected.to_not contain_package('python-software-properties') }
it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Exec[apt_update]').with({
'environment' => [],
'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow',
@ -25,11 +25,6 @@ describe 'apt::ppa', :type => :define do
'logoutput' => 'on_failure',
})
}
it { is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with({
'ensure' => 'file',
})
}
end
describe 'apt included, no proxy' do
@ -48,6 +43,7 @@ describe 'apt::ppa', :type => :define do
let :params do
{
'options' => '',
'package_manage' => true,
}
end
let(:title) { 'ppa:foo' }
@ -60,11 +56,6 @@ describe 'apt::ppa', :type => :define do
'logoutput' => 'on_failure',
})
}
it { is_expected.to contain_file('/etc/apt/sources.list.d/foo-trusty.list').that_requires('Exec[add-apt-repository-ppa:foo]').with({
'ensure' => 'file',
})
}
end
describe 'ensure absent' do