X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=5664edeed5220192b10bc1b0974e8ab98f557d78;hb=9fc556d023c32a6d213b2f2713de50b8ab00143d;hp=453df3171f3e0191cf4ff9018229a6297f85582e;hpb=0cbd24a4e59daa7c9e14d35ad7f38e00a93ba1dd;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index 453df31..5664ede 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,11 +1,16 @@
+# == Class: apt
 #
-class apt(
+# Manage APT (Advanced Packaging Tool)
+#
+class apt (
+  $confs    = {},
   $update   = {},
   $purge    = {},
   $proxy    = {},
   $sources  = {},
   $keys     = {},
   $ppas     = {},
+  $pins     = {},
   $settings = {},
 ) inherits ::apt::params {
 
@@ -26,7 +31,7 @@ class apt(
   }
 
   $_update = merge($::apt::update_defaults, $update)
-  include apt::update
+  include ::apt::update
 
   validate_hash($purge)
   if $purge['sources.list'] {
@@ -45,6 +50,9 @@ class apt(
   $_purge = merge($::apt::purge_defaults, $purge)
 
   validate_hash($proxy)
+  if $proxy['ensure'] {
+    validate_re($proxy['ensure'], ['file', 'present', 'absent'])
+  }
   if $proxy['host'] {
     validate_string($proxy['host'])
   }
@@ -59,26 +67,29 @@ class apt(
 
   $_proxy = merge($apt::proxy_defaults, $proxy)
 
+  validate_hash($confs)
   validate_hash($sources)
   validate_hash($keys)
   validate_hash($settings)
   validate_hash($ppas)
+  validate_hash($pins)
 
-  if $proxy['host'] {
+  if $_proxy['ensure'] == 'absent' or $_proxy['host'] {
     apt::setting { 'conf-proxy':
+      ensure   => $_proxy['ensure'],
       priority => '01',
-      content  => template('apt/_header.erb', 'apt/proxy.erb'),
+      content  => template('apt/_conf_header.erb', 'apt/proxy.erb'),
     }
   }
 
   $sources_list_content = $_purge['sources.list'] ? {
-    false => undef,
-    true  => "# Repos managed by puppet.\n",
+    true    => "# Repos managed by puppet.\n",
+    default => undef,
   }
 
   $preferences_ensure = $_purge['preferences'] ? {
-    false => file,
-    true  => absent,
+    true    => absent,
+    default => file,
   }
 
   if $_update['frequency'] == 'always' {
@@ -89,7 +100,7 @@ class apt(
 
   apt::setting { 'conf-update-stamp':
     priority => 15,
-    content  => template('apt/_header.erb', 'apt/15update-stamp.erb'),
+    content  => template('apt/_conf_header.erb', 'apt/15update-stamp.erb'),
   }
 
   file { 'sources.list':
@@ -99,7 +110,7 @@ class apt(
     group   => root,
     mode    => '0644',
     content => $sources_list_content,
-    notify  => Exec['apt_update'],
+    notify  => Class['apt::update'],
   }
 
   file { 'sources.list.d':
@@ -110,7 +121,7 @@ class apt(
     mode    => '0644',
     purge   => $_purge['sources.list.d'],
     recurse => $_purge['sources.list.d'],
-    notify  => Exec['apt_update'],
+    notify  => Class['apt::update'],
   }
 
   file { 'preferences':
@@ -119,7 +130,7 @@ class apt(
     owner  => root,
     group  => root,
     mode   => '0644',
-    notify => Exec['apt_update'],
+    notify => Class['apt::update'],
   }
 
   file { 'preferences.d':
@@ -130,14 +141,12 @@ class apt(
     mode    => '0644',
     purge   => $_purge['preferences.d'],
     recurse => $_purge['preferences.d'],
-    notify  => Exec['apt_update'],
+    notify  => Class['apt::update'],
   }
 
-  # Need anchor to provide containment for dependencies.
-  anchor { 'apt::update':
-    require => Class['apt::update'],
+  if $confs {
+    create_resources('apt::conf', $confs)
   }
-
   # manage sources if present
   if $sources {
     create_resources('apt::source', $sources)
@@ -154,4 +163,9 @@ class apt(
   if $settings {
     create_resources('apt::setting', $settings)
   }
+
+  # manage pins if present
+  if $pins {
+    create_resources('apt::pin', $pins)
+  }
 }