X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=33bf7730434c73b16dc695aabea11134072ff308;hb=46606c9a2b1c9b2b29aabcbbfe40312f54d00757;hp=23197719500809e6b4d1e5c4b4aa5ad87fdf7feb;hpb=6f68c5180c385cfb925e6457bec290a6e10849d2;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index 2319771..33bf773 100644
--- 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:
 #
@@ -23,23 +25,34 @@
 class apt(
   $always_apt_update    = false,
   $disable_keys         = undef,
-  $proxy_host           = false,
+  $proxy_host           = undef,
   $proxy_port           = '8080',
   $purge_sources_list   = false,
   $purge_sources_list_d = false,
-  $purge_preferences_d  = false
+  $purge_preferences    = false,
+  $purge_preferences_d  = false,
+  $update_timeout       = undef,
+  $sources              = undef
 ) {
 
   include apt::params
   include apt::update
 
-  validate_bool($purge_sources_list, $purge_sources_list_d, $purge_preferences_d)
+  validate_bool($purge_sources_list, $purge_sources_list_d,
+                $purge_preferences, $purge_preferences_d)
 
   $sources_list_content = $purge_sources_list ? {
     false => undef,
     true  => "# Repos managed by puppet.\n",
   }
 
+  $preferences_content = $purge_preferences ? {
+    false => undef,
+    true  => "Explanation: Preferences managed by Puppet\n
+Explanation: We need a bogus package line because of Debian Bug #732746\n
+Package: bogus-package\n",
+  }
+
   if $always_apt_update == true {
     Exec <| title=='apt_update' |> {
       refreshonly => false,
@@ -72,6 +85,15 @@ class apt(
     notify  => Exec['apt_update'],
   }
 
+  file { 'apt-preferences':
+    ensure  => present,
+    path    => "${root}/preferences",
+    owner   => root,
+    group   => root,
+    mode    => '0644',
+    content => $preferences_content,
+  }
+
   file { 'preferences.d':
     ensure  => directory,
     path    => $preferences_d,
@@ -100,19 +122,25 @@ class apt(
   }
 
   $proxy_set = $proxy_host ? {
-    false   => absent,
+    undef   => absent,
     default => present
   }
 
   file { 'configure-apt-proxy':
+    ensure  => $proxy_set,
     path    => "${apt_conf_d}/proxy",
     content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
     notify  => Exec['apt_update'],
-    ensure  => $proxy_set,
   }
 
   # Need anchor to provide containment for dependencies.
   anchor { 'apt::update':
     require => Class['apt::update'],
   }
+
+  # manage sources if present
+  if $sources != undef {
+   validate_hash($sources)
+   create_resources('apt::source', $sources)
+  }
 }