X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=442e04c5875262ec0c3564863527f47341db3d5e;hb=a3d782c3b5cf128b3ef8e910ef42297a38a96a02;hp=ba53fd2a23f2f04fd163b0cc0532b6355c180971;hpb=e656c65818f1140e396e83610ab7f06f0f07db79;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index ba53fd2..442e04c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,57 +16,69 @@
 # Actions:
 #
 # Requires:
-#
+#   puppetlabs/stdlib
 # Sample Usage:
 #  class { 'apt': }
+
 class apt(
-  $always_apt_update = false,
-  $disable_keys = undef,
-  $proxy_host = false,
-  $proxy_port = '8080',
-  $purge_sources_list = false,
-  $purge_sources_list_d = false
+  $always_apt_update    = false,
+  $disable_keys         = undef,
+  $proxy_host           = false,
+  $proxy_port           = '8080',
+  $purge_sources_list   = false,
+  $purge_sources_list_d = false,
+  $purge_preferences_d  = false
 ) {
 
   include apt::params
+  include apt::update
 
-  validate_bool($purge_sources_list, $purge_sources_list_d)
+  validate_bool($purge_sources_list, $purge_sources_list_d, $purge_preferences_d)
 
-  $refresh_only_apt_update = $always_apt_update? {
-    true  => false,
-    false => true,
+  $sources_list_content = $purge_sources_list ? {
+    false => undef,
+    true  => "# Repos managed by puppet.\n",
   }
 
-  if ! defined(Package['python-software-properties']) {
-    package { 'python-software-properties': }
+  if $always_apt_update == true {
+    Exec <| title=='apt_update' |> {
+      refreshonly => false,
+    }
   }
 
-  $sources_list_content = $purge_sources_list ? {
-    false =>  undef,
-    true  => "# Repos managed by puppet.\n",
-  }
+  $root           = $apt::params::root
+  $apt_conf_d     = $apt::params::apt_conf_d
+  $sources_list_d = $apt::params::sources_list_d
+  $preferences_d  = $apt::params::preferences_d
+  $provider       = $apt::params::provider
+
   file { 'sources.list':
     ensure  => present,
-    path    => "${apt::params::root}/sources.list",
+    path    => "${root}/sources.list",
     owner   => root,
     group   => root,
     mode    => '0644',
     content => $sources_list_content,
+    notify  => Exec['apt_update'],
   }
 
   file { 'sources.list.d':
     ensure  => directory,
-    path    => "${apt::params::root}/sources.list.d",
+    path    => $sources_list_d,
     owner   => root,
     group   => root,
     purge   => $purge_sources_list_d,
     recurse => $purge_sources_list_d,
+    notify  => Exec['apt_update'],
   }
 
-  exec { 'apt_update':
-    command     => "${apt::params::provider} update",
-    subscribe   => [ File['sources.list'], File['sources.list.d'] ],
-    refreshonly => $refresh_only_apt_update,
+  file { 'preferences.d':
+    ensure  => directory,
+    path    => $preferences_d,
+    owner   => root,
+    group   => root,
+    purge   => $purge_preferences_d,
+    recurse => $purge_preferences_d,
   }
 
   case $disable_keys {
@@ -74,24 +86,29 @@ class apt(
       file { '99unauth':
         ensure  => present,
         content => "APT::Get::AllowUnauthenticated 1;\n",
-        path    => '/etc/apt/apt.conf.d/99unauth',
+        path    => "${apt_conf_d}/99unauth",
       }
     }
     false: {
       file { '99unauth':
         ensure => absent,
-        path   => '/etc/apt/apt.conf.d/99unauth',
+        path   => "${apt_conf_d}/99unauth",
       }
     }
-    undef: { } # do nothing
+    undef:   { } # do nothing
     default: { fail('Valid values for disable_keys are true or false') }
   }
 
   if ($proxy_host) {
     file { 'configure-apt-proxy':
-      path    => '/etc/apt/apt.conf.d/proxy',
+      path    => "${apt_conf_d}/proxy",
       content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
       notify  => Exec['apt_update'],
     }
   }
+
+  # Need anchor to provide containment for dependencies.
+  anchor { 'apt::update':
+    require => Class['apt::update'],
+  }
 }