X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=3587d21b5b00174c7b4ae3333ea96d01d773c132;hb=d49dbb49ae2d450e434133640a71107c61d8d56d;hp=53e25dca0ec26363a300aca2ef9bf9d10467cded;hpb=f13f3cfac7c719aa4b7025fe7d427df638fc5cc2;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index 53e25dc..3587d21 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,26 +16,24 @@
 # 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)
-
-  if ! defined(Package['python-software-properties']) {
-    package { 'python-software-properties': }
-  }
+  validate_bool($purge_sources_list, $purge_sources_list_d, $purge_preferences_d)
 
   $sources_list_content = $purge_sources_list ? {
     false => undef,
@@ -51,6 +49,7 @@ class apt(
   $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':
@@ -73,6 +72,15 @@ class apt(
     notify  => Exec['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 {
     true: {
       file { '99unauth':
@@ -98,4 +106,9 @@ class apt(
       notify  => Exec['apt_update'],
     }
   }
+
+  # Need anchor to provide containment for dependencies.
+  anchor { "apt::update":
+    require => Class['apt::update'],
+  }
 }