From e085e66f0f1c045b0282f738f4501e7a1d2fd301 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 20 Jun 2013 12:03:34 -0400
Subject: We need to have a newer facter installed in order to get an updated
 fact for piston cloud

This moves the apt configuration into the setup.pp run, so we can get the
backport source added early which will enable us to install the latest facter
from the backports repository.

Change-Id: I8ccf1a0445dea72f1b94be08484f33e648439ec1
---
 puppet/manifests/setup.pp                 | 11 ++++++++++-
 puppet/modules/site_apt/manifests/init.pp |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'puppet')

diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
index b45c8b4c..6adb1948 100644
--- a/puppet/manifests/setup.pp
+++ b/puppet/manifests/setup.pp
@@ -1,4 +1,13 @@
 #
 # this is applied before each run of site.pp
 #
-include site_config::hosts
\ No newline at end of file
+$services = ''
+include site_config::hosts
+
+include site_apt
+
+package { 'facter':
+  ensure  => latest,
+  require => Exec['refresh_apt']
+}
+
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index c5f37014..c33b7a84 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -23,4 +23,9 @@ class site_apt  {
     content => template('site_apt/secondary.list');
   }
 
+  apt::preferences_snippet { 'facter':
+    release  => "${::lsbdistcodename}-backports",
+    priority => 999
+  }
+
 }
-- 
cgit v1.2.3


From f2f4b3cfc2ad70e649da42ef82cca7c2e1d73096 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 24 Jun 2013 00:02:19 +0200
Subject: Install all packages after refresh_apt (Feature #2971)

---
 puppet/modules/site_apt/manifests/init.pp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'puppet')

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index c33b7a84..0da7f3be 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -28,4 +28,12 @@ class site_apt  {
     priority => 999
   }
 
+  # All packages should be installed _after_ refresh_apt is called,
+  # which does an apt-get update.
+  # There is one exception:
+  # The creation of sources.list depends on the lsb package
+
+  File['/etc/apt/preferences'] ->
+    Exec['refresh_apt']
+    Package <| ( title != 'lsb' ) |>
 }
-- 
cgit v1.2.3


From e61c7dfe1aa0ba4b5fc5fef2fd64d9fb2f1d2784 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Jun 2013 17:38:13 +0200
Subject: updated apt submodule, remove unnecessary before dependency on the
 /etc/apt/preferences file in unattended_upgrades.pp

---
 puppet/modules/apt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet')

diff --git a/puppet/modules/apt b/puppet/modules/apt
index 61a2f489..f11e3d47 160000
--- a/puppet/modules/apt
+++ b/puppet/modules/apt
@@ -1 +1 @@
-Subproject commit 61a2f4894898baa98dbaaba7b69b7198864ca04a
+Subproject commit f11e3d475345059220402a44a97da491c85d2b5a
-- 
cgit v1.2.3