collect slightly fewer packages

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index f3d6f68ec52e8faba0b72697df5d80b88bc6011d..0afd927f1cc4bb1a08ff1fedc733a7483911b606 100644 (file)
--- 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 691abf60cea5bc0a27e321b20262ef74abb5d23a..3a9d5087aa50b6d306cc038340f6b9b7a1605789 100644 (file)
--- 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 4d7d63f20cfe54b1fcdbabd26c05a5cbcbd45171..1c42d5f59cea63ca311f16501b66ed7b19ce94bc 100644 (file)
--- 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 1dc59f66978a5eff7778a0a43a4e8feead958acb..60d24920fca0541dab3b24f5ef649a182d2917fe 100644 (file)
--- 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 993e5de058da6a2060485b5964f0070af72ad880..410bb5ee8fe976017b00329018ec1ddc0034079f 100644 (file)
--- 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 7c5d6ca522d962ba1300e9313e145d2a6401e96f..a2c2230b6858d6c2251937cb950cfc1cff419481 100644 (file)
--- 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 db6179f10ca01633a0718708cc0fa1c20e6c334a..e53de75cd23b3b8c547a219e26d04db6584ebc37 100644 (file)
--- 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'],
        }
 }