X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=03856a273bf00832ace479fe13d7704629862206;hb=2cdcd3b06dd199d400c70c1c36f508583330b428;hp=ad3f5e06e03cb4a38ff5f5e32e4e379c8df373d1;hpb=4d0bf7cbab1fc9c9fd0ff174315e69262cfe5f68;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index ad3f5e0..03856a2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -14,6 +14,9 @@
 #     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)
+#   update_tries - Number of times that `apt-get update` will be tried. Use this
+#     to work around transient DNS and HTTP errors. By default, the command
+#     will only be run once.
 #
 # Actions:
 #
@@ -31,7 +34,10 @@ class apt(
   $purge_sources_list_d = false,
   $purge_preferences    = false,
   $purge_preferences_d  = false,
-  $update_timeout       = undef
+  $update_timeout       = undef,
+  $update_tries         = undef,
+  $sources              = undef,
+  $fancy_progress       = undef
 ) {
 
   if $::osfamily != 'Debian' {
@@ -106,6 +112,24 @@ Package: bogus-package\n",
     recurse => $purge_preferences_d,
   }
 
+  case $fancy_progress {
+    true: {
+      file { '99progressbar':
+        ensure  => present,
+        content => 'Dpkg::Progress-Fancy "1";',
+        path    => "${apt_conf_d}/99progressbar",
+      }
+    }
+    false: {
+      file { '99progressbar':
+        ensure  => absent,
+        path    => "${apt_conf_d}/99progressbar",
+      }
+    }
+    undef: {} # do nothing
+    default: { fail('Valid values for fancy_progress are true or false') }
+  }
+
   case $disable_keys {
     true: {
       file { '99unauth':
@@ -129,10 +153,19 @@ Package: bogus-package\n",
     default => present
   }
 
-  file { 'configure-apt-proxy':
+  file { '01proxy':
     ensure  => $proxy_set,
+    path    => "${apt_conf_d}/01proxy",
+    content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
+    notify  => Exec['apt_update'],
+    mode    => '0644',
+    owner   => root,
+    group   => root,
+  }
+  
+  file { 'old-proxy-file':
+    ensure  => absent,
     path    => "${apt_conf_d}/proxy",
-    content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
     notify  => Exec['apt_update'],
   }
 
@@ -140,4 +173,10 @@ Package: bogus-package\n",
   anchor { 'apt::update':
     require => Class['apt::update'],
   }
+
+  # manage sources if present
+  if $sources != undef {
+    validate_hash($sources)
+    create_resources('apt::source', $sources)
+  }
 }