Merge pull request #168 from apenney/rspec-system

Add initial rspec-system tests.

diff --git a/README.md b/README.md
index 402d7ab021982244b61a07ab923405c536418cd3..2ce5340ab62dfd128e7db318019a046d2813ad1d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -54,7 +54,8 @@ The parameters for `apt` are not required in general and are predominantly for d
       proxy_port           => '8080',
       purge_sources_list   => 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. 

diff --git a/manifests/init.pp b/manifests/init.pp
index 8f0c87bb5415ade4b11774849f6743889eca3375..b106ad490979ce67522382eb02f54a9ce7a1a15d 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,6 +12,8 @@
 #     true, Puppet will purge all unmanaged entries from sources.list
 #   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
+#   update_timeout - Overrides the exec timeout in seconds for apt-get update.
+#     If not set defaults to Exec's default (300)
 #
 # Actions:
 #
@@ -27,7 +29,8 @@ class apt(
   $proxy_port           = '8080',
   $purge_sources_list   = false,
   $purge_sources_list_d = false,
-  $purge_preferences_d  = false
+  $purge_preferences_d  = false,
+  $update_timeout       = undef
 ) {
 
   include apt::params

diff --git a/manifests/update.pp b/manifests/update.pp
index e9b9ea9554b941bf0e1757ac034d9b3114108c89..ce0b78fbddbded8805ff4e56aa1a2ad9d24a9f18 100644 (file)
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -5,5 +5,6 @@ class apt::update {
     command     => "${apt::params::provider} update",
     logoutput   => 'on_failure',
     refreshonly => true,
+    timeout     => $apt::update_timeout,
   }
 }