Merge branch '1.5.x' of https://github.com/puppetlabs/puppetlabs-apt into 1.5.x
This commit is contained in:
commit
8e0887cafb
5 changed files with 33 additions and 16 deletions
6
Rakefile
6
Rakefile
|
@ -1,4 +1,10 @@
|
||||||
require 'puppetlabs_spec_helper/rake_tasks'
|
require 'puppetlabs_spec_helper/rake_tasks'
|
||||||
require 'puppet-lint/tasks/puppet-lint'
|
require 'puppet-lint/tasks/puppet-lint'
|
||||||
|
|
||||||
|
PuppetLint.configuration.fail_on_warnings
|
||||||
|
PuppetLint.configuration.send('disable_80chars')
|
||||||
|
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
|
||||||
|
PuppetLint.configuration.send('disable_class_parameter_defaults')
|
||||||
|
PuppetLint.configuration.send('disable_documentation')
|
||||||
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
|
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
|
||||||
|
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
|
||||||
|
|
|
@ -15,7 +15,7 @@ define apt::ppa(
|
||||||
}
|
}
|
||||||
|
|
||||||
if $::operatingsystem != 'Ubuntu' {
|
if $::operatingsystem != 'Ubuntu' {
|
||||||
fail("apt::ppa is currently supported on Ubuntu only.")
|
fail('apt::ppa is currently supported on Ubuntu only.')
|
||||||
}
|
}
|
||||||
|
|
||||||
$filename_without_slashes = regsubst($name, '/', '-', 'G')
|
$filename_without_slashes = regsubst($name, '/', '-', 'G')
|
||||||
|
|
|
@ -16,26 +16,26 @@
|
||||||
class apt::unattended_upgrades (
|
class apt::unattended_upgrades (
|
||||||
$origins = $::apt::params::origins,
|
$origins = $::apt::params::origins,
|
||||||
$blacklist = [],
|
$blacklist = [],
|
||||||
$update = "1",
|
$update = '1',
|
||||||
$download = "1",
|
$download = '1',
|
||||||
$upgrade = "1",
|
$upgrade = '1',
|
||||||
$autoclean = "7",
|
$autoclean = '7',
|
||||||
$auto_fix = true,
|
$auto_fix = true,
|
||||||
$minimal_steps = false,
|
$minimal_steps = false,
|
||||||
$install_on_shutdown = false,
|
$install_on_shutdown = false,
|
||||||
$mail_to = "NONE",
|
$mail_to = 'NONE',
|
||||||
$mail_only_on_error = false,
|
$mail_only_on_error = false,
|
||||||
$remove_unused = true,
|
$remove_unused = true,
|
||||||
$auto_reboot = false,
|
$auto_reboot = false,
|
||||||
$dl_limit = "NONE",
|
$dl_limit = 'NONE',
|
||||||
$enable = "1",
|
$enable = '1',
|
||||||
$backup_interval = "0",
|
$backup_interval = '0',
|
||||||
$backup_level = "3",
|
$backup_level = '3',
|
||||||
$max_age = "0",
|
$max_age = '0',
|
||||||
$min_age = "0",
|
$min_age = '0',
|
||||||
$max_size = "0",
|
$max_size = '0',
|
||||||
$download_delta = "0",
|
$download_delta = '0',
|
||||||
$verbose = "0",
|
$verbose = '0',
|
||||||
) inherits ::apt::params {
|
) inherits ::apt::params {
|
||||||
|
|
||||||
validate_bool(
|
validate_bool(
|
||||||
|
|
11
spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
Normal file
11
spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
HOSTS:
|
||||||
|
ubuntu-server-1404-x64:
|
||||||
|
roles:
|
||||||
|
- master
|
||||||
|
platform: ubuntu-14.04-amd64
|
||||||
|
box : puppetlabs/ubuntu-14.04-64-nocm
|
||||||
|
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
|
||||||
|
hypervisor : vagrant
|
||||||
|
CONFIG:
|
||||||
|
log_level : debug
|
||||||
|
type: git
|
Loading…
Reference in a new issue