From 4b5b54d031344aa7a7b86254c820e391a4d4d762 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 25 Jun 2013 17:05:11 -0400
Subject: update the apt submodule in order to get the fix for
 unattended_upgrades (#2984) and the custom_key_dir as a class parameter

remove the global variable from setup.pp and site.pp and instead pass it into the apt class declaration as a parameter

Change-Id: I24806f2fd22b5a066b951c5f76f3dd748481b5b6
---
 puppet/manifests/setup.pp                 | 1 -
 puppet/manifests/site.pp                  | 2 --
 puppet/modules/apt                        | 2 +-
 puppet/modules/site_apt/manifests/init.pp | 5 ++++-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'puppet')

diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
index 112782d8..80e7ffc2 100644
--- a/puppet/manifests/setup.pp
+++ b/puppet/manifests/setup.pp
@@ -4,7 +4,6 @@
 $services = ''
 
 Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
-$custom_key_dir = 'puppet:///modules/site_apt/keys'
 
 include site_config::hosts
 
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index f0319bc2..08cbbb9e 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,8 +1,6 @@
 # set a default exec path
 Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
 
-$custom_key_dir = 'puppet:///modules/site_apt/keys'
-
 # parse services for host
 $services=join(hiera_array('services'), ' ')
 notice("Services for ${fqdn}: ${services}")
diff --git a/puppet/modules/apt b/puppet/modules/apt
index f11e3d47..1a72a996 160000
--- a/puppet/modules/apt
+++ b/puppet/modules/apt
@@ -1 +1 @@
-Subproject commit f11e3d475345059220402a44a97da491c85d2b5a
+Subproject commit 1a72a99693c1d77bfe891546408f88264fca98ee
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 0da7f3be..8821c110 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -8,7 +8,10 @@ class site_apt  {
   } else {
     $custom_preferences = ''
   }
-  class {'apt': custom_preferences => $custom_preferences }
+  class { 'apt':
+    custom_preferences => $custom_preferences,
+    custom_key_dir     => 'puppet:///modules/site_apt/keys'
+  }
 
   # enable http://deb.leap.se debian package repository
   include site_apt::leap_repo
-- 
cgit v1.2.3