proxy_* params were removed from class apt
Add them to PPA since they were being used there, and add a placeholder example for setting up the proxy files.
This commit is contained in:
parent
1c0c6f106a
commit
3e44b685d2
4 changed files with 75 additions and 2 deletions
1
examples/proxy.pp
Normal file
1
examples/proxy.pp
Normal file
|
@ -0,0 +1 @@
|
||||||
|
# TODO
|
|
@ -31,6 +31,11 @@ class apt::params {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$proxy = {
|
||||||
|
'host' => undef,
|
||||||
|
'port' => 8080,
|
||||||
|
}
|
||||||
|
|
||||||
$file_defaults = {
|
$file_defaults = {
|
||||||
'owner' => 'root',
|
'owner' => 'root',
|
||||||
'group' => 'root',
|
'group' => 'root',
|
||||||
|
|
|
@ -5,6 +5,7 @@ define apt::ppa(
|
||||||
$options = $::apt::ppa_options,
|
$options = $::apt::ppa_options,
|
||||||
$package_name = $::apt::ppa_package,
|
$package_name = $::apt::ppa_package,
|
||||||
$package_manage = false,
|
$package_manage = false,
|
||||||
|
$proxy = {},
|
||||||
) {
|
) {
|
||||||
if ! $release {
|
if ! $release {
|
||||||
fail('lsbdistcodename fact not available: release parameter required')
|
fail('lsbdistcodename fact not available: release parameter required')
|
||||||
|
@ -19,6 +20,8 @@ define apt::ppa(
|
||||||
$filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', 'G')
|
$filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', 'G')
|
||||||
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
|
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
|
||||||
|
|
||||||
|
$_proxy = merge($apt::proxy, $proxy)
|
||||||
|
|
||||||
if $ensure == 'present' {
|
if $ensure == 'present' {
|
||||||
if $package_manage {
|
if $package_manage {
|
||||||
package { $package_name: }
|
package { $package_name: }
|
||||||
|
@ -28,12 +31,12 @@ define apt::ppa(
|
||||||
$_require = File['sources.list.d']
|
$_require = File['sources.list.d']
|
||||||
}
|
}
|
||||||
|
|
||||||
case $::apt::proxy_host {
|
case $_proxy['host'] {
|
||||||
false, '', undef: {
|
false, '', undef: {
|
||||||
$_proxy_env = []
|
$_proxy_env = []
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
$_proxy_env = ["http_proxy=http://${::apt::proxy_host}:${::apt::proxy_port}", "https_proxy=http://${::apt::proxy_host}:${::apt::proxy_port}"]
|
$_proxy_env = ["http_proxy=http://${_proxy['host']}:${_proxy['port']}", "https_proxy=http://${_proxy['host']}:${_proxy['port']}"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,6 +58,70 @@ describe 'apt::ppa', :type => :define do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'apt included, proxy host' do
|
||||||
|
let :pre_condition do
|
||||||
|
'class { "apt": }'
|
||||||
|
end
|
||||||
|
let :facts do
|
||||||
|
{
|
||||||
|
:lsbdistrelease => '14.04',
|
||||||
|
:lsbdistcodename => 'trusty',
|
||||||
|
:operatingsystem => 'Ubuntu',
|
||||||
|
:lsbdistid => 'Ubuntu',
|
||||||
|
:osfamily => 'Debian',
|
||||||
|
}
|
||||||
|
end
|
||||||
|
let :params do
|
||||||
|
{
|
||||||
|
'options' => '',
|
||||||
|
'package_manage' => true,
|
||||||
|
'proxy' => { 'host' => 'localhost', }
|
||||||
|
}
|
||||||
|
end
|
||||||
|
let(:title) { 'ppa:foo' }
|
||||||
|
it { is_expected.to contain_package('software-properties-common') }
|
||||||
|
it { is_expected.to contain_exec('add-apt-repository-ppa:foo').that_notifies('Exec[apt_update]').with({
|
||||||
|
'environment' => ['http_proxy=http://localhost:8080', 'https_proxy=http://localhost:8080'],
|
||||||
|
'command' => '/usr/bin/add-apt-repository ppa:foo',
|
||||||
|
'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/foo-trusty.list',
|
||||||
|
'user' => 'root',
|
||||||
|
'logoutput' => 'on_failure',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'apt included, proxy host and port' do
|
||||||
|
let :pre_condition do
|
||||||
|
'class { "apt": }'
|
||||||
|
end
|
||||||
|
let :facts do
|
||||||
|
{
|
||||||
|
:lsbdistrelease => '14.04',
|
||||||
|
:lsbdistcodename => 'trusty',
|
||||||
|
:operatingsystem => 'Ubuntu',
|
||||||
|
:lsbdistid => 'Ubuntu',
|
||||||
|
:osfamily => 'Debian',
|
||||||
|
}
|
||||||
|
end
|
||||||
|
let :params do
|
||||||
|
{
|
||||||
|
'options' => '',
|
||||||
|
'package_manage' => true,
|
||||||
|
'proxy' => { 'host' => 'localhost', 'port' => 8180, }
|
||||||
|
}
|
||||||
|
end
|
||||||
|
let(:title) { 'ppa:foo' }
|
||||||
|
it { is_expected.to contain_package('software-properties-common') }
|
||||||
|
it { is_expected.to contain_exec('add-apt-repository-ppa:foo').that_notifies('Exec[apt_update]').with({
|
||||||
|
'environment' => ['http_proxy=http://localhost:8180', 'https_proxy=http://localhost:8180'],
|
||||||
|
'command' => '/usr/bin/add-apt-repository ppa:foo',
|
||||||
|
'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/foo-trusty.list',
|
||||||
|
'user' => 'root',
|
||||||
|
'logoutput' => 'on_failure',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
describe 'ensure absent' do
|
describe 'ensure absent' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
'class { "apt": }'
|
'class { "apt": }'
|
||||||
|
|
Loading…
Reference in a new issue