Merge pull request #146 from botify-labs/handle_ppa_options

Fix: parametrize apt::ppa class for beign able to pass options to apt-add-repository command
This commit is contained in:
Ashley Penney 2013-07-17 05:08:11 -07:00
commit e4fe87ca9d
2 changed files with 8 additions and 4 deletions

View file

@ -1,7 +1,8 @@
# ppa.pp
define apt::ppa(
$release = $::lsbdistcodename
$release = $::lsbdistcodename,
$options = "-y"
) {
include apt::params
include apt::update
@ -40,7 +41,7 @@ define apt::ppa(
}
exec { "add-apt-repository-${name}":
environment => $proxy_env,
command => "/usr/bin/add-apt-repository ${name}",
command => "/usr/bin/add-apt-repository ${options} ${name}",
creates => "${sources_list_d}/${sources_list_d_filename}",
logoutput => 'on_failure',
require => [

View file

@ -20,6 +20,9 @@ describe 'apt::ppa', :type => :define do
let :package do
"#{platform[:package]}"
end
let :options do
"-y"
end
['ppa:dans_ppa', 'dans_ppa','ppa:dans-daily/ubuntu'].each do |t|
describe "with title #{t}" do
let :pre_condition do
@ -41,7 +44,7 @@ describe 'apt::ppa', :type => :define do
}
it { should contain_exec("add-apt-repository-#{t}").with(
'command' => "/usr/bin/add-apt-repository #{t}",
'command' => "/usr/bin/add-apt-repository #{options} #{t}",
'creates' => "/etc/apt/sources.list.d/#{filename}",
'require' => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
'notify' => "Exec[apt_update]"
@ -73,7 +76,7 @@ describe 'apt::ppa', :type => :define do
"http_proxy=http://user:pass@proxy:8080",
"https_proxy=http://user:pass@proxy:8080",
],
'command' => "/usr/bin/add-apt-repository #{title}",
'command' => "/usr/bin/add-apt-repository #{options} #{title}",
'creates' => "/etc/apt/sources.list.d/#{filename}",
'require' => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
'notify' => "Exec[apt_update]"