From: Thomas Broyer <t.broyer@ltgt.net>
Date: Fri, 30 Mar 2012 15:48:31 +0000 (+0200)
Subject: Make sure we configure the proxy before doing apt-get update.
X-Git-Tag: 0.0.3~8^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e656c65818f1140e396e83610ab7f06f0f07db79;p=puppet-modules%2Fpuppetlabs-apt.git

Make sure we configure the proxy before doing apt-get update.
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 29db697..ba53fd2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -87,10 +87,11 @@ class apt(
     default: { fail('Valid values for disable_keys are true or false') }
   }
 
-  if($proxy_host) {
+  if ($proxy_host) {
     file { 'configure-apt-proxy':
       path    => '/etc/apt/apt.conf.d/proxy',
       content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
+      notify  => Exec['apt_update'],
     }
   }
 }
diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 000793d..079bd59 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -117,7 +117,8 @@ describe 'apt', :type => :class do
           if param_hash[:proxy_host]
             should contain_file('configure-apt-proxy').with(
               'path'    => '/etc/apt/apt.conf.d/proxy',
-              'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";"
+              'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";",
+              'notify'  => "Exec[apt_update]"
             )
           else
             should_not contain_file('configure_apt_proxy')