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(-)

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