From e3bf9169d9d19369a48b22c25c723c554d584a87 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 12 Sep 2013 17:12:18 +0000
Subject: [PATCH] Add saltstack APT repository to automatic upgrades

* modules/openstack_project/manifests/automatic_upgrades.pp: Pass
the additional allowed origins list through to the unattended
upgrades module.

* modules/openstack_project/manifests/slave.pp: Add the
"LP-PPA-saltstack-salt precise" repository origin to the list of
allowed origins for automatic upgrades.

* modules/unattended_upgrades/manifests/init.pp: Add a list of
additional allowed origins for package repository upgrades and
convert the apt-preferences stub for 50unattended-upgrades to a
template so the list can be applied to it.

* modules/unattended_upgrades/templates/50unattended-upgrades.erb:
Renamed from ../../files/50unattended-upgrades and enhanced with a
loop over the origins list to append to the default set of allowed
upgrade origins.

Change-Id: I821d199ae1a00ed78c2a52bf80ddba8a4eaa7d8b
---
 manifests/init.pp                                          | 7 +++++--
 .../50unattended-upgrades.erb                              | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)
 rename files/50unattended-upgrades => templates/50unattended-upgrades.erb (94%)

diff --git a/manifests/init.pp b/manifests/init.pp
index d04ffc0..c4a7555 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,6 +1,9 @@
 # == Class: unattended_upgrades
 #
-class unattended_upgrades($ensure = present) {
+class unattended_upgrades(
+  $ensure = present,
+  $origins = []
+) {
   package { 'unattended-upgrades':
     ensure => $ensure,
   }
@@ -23,7 +26,7 @@ class unattended_upgrades($ensure = present) {
     owner   => 'root',
     group   => 'root',
     mode    => '0444',
-    source  => 'puppet:///modules/unattended_upgrades/50unattended-upgrades',
+    content => template('unattended_upgrades/50unattended-upgrades.erb'),
     replace => true,
   }
 }
diff --git a/files/50unattended-upgrades b/templates/50unattended-upgrades.erb
similarity index 94%
rename from files/50unattended-upgrades
rename to templates/50unattended-upgrades.erb
index 5faa45e..2815768 100644
--- a/files/50unattended-upgrades
+++ b/templates/50unattended-upgrades.erb
@@ -5,6 +5,9 @@ Unattended-Upgrade::Allowed-Origins {
     "${distro_id} ${distro_codename}-security";
     "${distro_id} ${distro_codename}-updates";
 //  "${distro_id} ${distro_codename}-proposed-updates";
+<% origins.each do |origin| -%>
+    "<%= origin %>";
+<% end -%>
 };
 
 // List of packages to not update