From f78c0ac2fb83426730fb99117f7656349f9cbbcc Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Tue, 1 Jan 2013 20:39:54 +0000
Subject: [PATCH] collect slightly fewer packages

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 modules/bacula/manifests/director.pp        | 3 +--
 modules/buildd/manifests/init.pp            | 5 ++++-
 modules/debian-org/manifests/init.pp        | 4 +++-
 modules/hardware/manifests/raid/megactl.pp  | 1 +
 modules/hardware/manifests/raid/proliant.pp | 2 ++
 modules/nagios/manifests/client.pp          | 1 +
 modules/site/manifests/aptrepo.pp           | 6 +++---
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index f3d6f68e..0afd927f 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -15,8 +15,7 @@ class bacula::director inherits bacula {
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 		command     => 'service bacula-director reload',
 		refreshonly => true,
-        }
-
+	}
 
 	file { '/etc/bacula/conf.d':
 		ensure  => directory,
diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 691abf60..3a9d5087 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,13 +1,16 @@
 class buildd {
 
 	package { 'schroot':
-		ensure => installed
+		ensure => installed,
+		tag    => extra_repo,
 	}
 	package { 'sbuild':
 		ensure => installed,
+		tag    => extra_repo,
 	}
 	package { 'libsbuild-perl':
 		ensure => installed,
+		tag    => extra_repo,
 		before => Package['sbuild']
 	}
 
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 4d7d63f2..1c42d5f5 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -20,6 +20,7 @@ class debian-org {
 			'dsa-munin-plugins',
 		]:
 		ensure => installed,
+		tag    => extra_repo,
 	}
 
 	package { [
@@ -65,6 +66,7 @@ class debian-org {
 	if getfromhash($site::nodeinfo, 'broken-rtc') {
 		package { 'fake-hwclock':
 			ensure => installed,
+			tag    => extra_repo,
 		}
 	}
 
@@ -229,7 +231,7 @@ class debian-org {
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 		refreshonly => true,
 	}
-	Exec['apt-get update']->Package<| |>
+	Exec['apt-get update']->Package<| tag == extra_repo |>
 
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
diff --git a/modules/hardware/manifests/raid/megactl.pp b/modules/hardware/manifests/raid/megactl.pp
index 1dc59f66..60d24920 100644
--- a/modules/hardware/manifests/raid/megactl.pp
+++ b/modules/hardware/manifests/raid/megactl.pp
@@ -2,6 +2,7 @@ class hardware::raid::megactl {
 
 	package { 'megactl':
 		ensure => installed,
+		tag    => extra_repo,
 	}
 
 	site::aptrepo { 'debian.restricted':
diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 993e5de0..410bb5ee 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -8,9 +8,11 @@ class hardware::raid::proliant {
 
 	package { 'hpacucli':
 		ensure  => installed,
+		tag    => extra_repo,
 	}
 	package { 'hp-health':
 		ensure => installed,
+		tag    => extra_repo,
 	}
 	package { 'arrayprobe':
 		ensure => installed,
diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 7c5d6ca5..a2c2230b 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -5,6 +5,7 @@ class nagios::client inherits nagios {
 	}
 	package { 'dsa-nagios-checks':
 		ensure => installed,
+		tag    => extra_repo,
 	}
 
 	service { 'nagios-nrpe-server':
diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index db6179f1..e53de75c 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -55,8 +55,8 @@ define site::aptrepo (
 	}
 
 	file { "/etc/apt/sources.list.d/${name}.list":
-			ensure  => $ensure,
-			content => template('site/aptrepo.erb'),
-			notify  => Exec['apt-get update'],
+		ensure  => $ensure,
+		content => template('site/aptrepo.erb'),
+		notify  => Exec['apt-get update'],
 	}
 }
-- 
2.39.2