Merge pull request #167 from madeddie/master

add an updates_timeout option to apt::params (PR fix)
This commit is contained in:
Ashley Penney 2013-10-02 06:07:05 -07:00
commit 5c49633f4f
3 changed files with 7 additions and 2 deletions

View file

@ -54,7 +54,8 @@ The parameters for `apt` are not required in general and are predominantly for d
proxy_port => '8080', proxy_port => '8080',
purge_sources_list => false, purge_sources_list => false,
purge_sources_list_d => false, purge_sources_list_d => false,
purge_preferences_d => false purge_preferences_d => false,
update_timeout => undef
} }
Puppet will manage your system's `sources.list` file and `sources.list.d` directory but will do its best to respect existing content. Puppet will manage your system's `sources.list` file and `sources.list.d` directory but will do its best to respect existing content.

View file

@ -12,6 +12,8 @@
# true, Puppet will purge all unmanaged entries from sources.list # true, Puppet will purge all unmanaged entries from sources.list
# purge_sources_list_d - Accepts true or false. Defaults to false. If set # purge_sources_list_d - Accepts true or false. Defaults to false. If set
# to true, Puppet will purge all unmanaged entries from sources.list.d # to true, Puppet will purge all unmanaged entries from sources.list.d
# update_timeout - Overrides the exec timeout in seconds for apt-get update.
# If not set defaults to Exec's default (300)
# #
# Actions: # Actions:
# #
@ -27,7 +29,8 @@ class apt(
$proxy_port = '8080', $proxy_port = '8080',
$purge_sources_list = false, $purge_sources_list = false,
$purge_sources_list_d = false, $purge_sources_list_d = false,
$purge_preferences_d = false $purge_preferences_d = false,
$update_timeout = undef
) { ) {
include apt::params include apt::params

View file

@ -5,5 +5,6 @@ class apt::update {
command => "${apt::params::provider} update", command => "${apt::params::provider} update",
logoutput => 'on_failure', logoutput => 'on_failure',
refreshonly => true, refreshonly => true,
timeout => $apt::update_timeout,
} }
} }