manual dependencies

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 1de4f33..161238b 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -2,18 +2,30 @@ class buildd {
 
        # sigh, sort this mess out, kids
        if $::lsbdistcodename in [lenny,squeeze] {
-               package { 'schroot': ensure => installed }
+               package { 'schroot':
+                       ensure => installed,
+                       require => [
+                               File['/etc/apt/sources.list.d/db.debian.org.list'],
+                               Exec['apt-get update']
+                       ]
+               }
        } else {
                package { 'schroot': ensure => held }
        }
 
+       package { 'apt-transport-https':
+               ensure => installed,
+       }
        package { [
                        'sbuild',
-                       'apt-transport-https',
                        'debootstrap',
                        'dupload'
                ]:
-                       ensure => installed
+               ensure => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/db.debian.org.list'],
+                       Exec['apt-get update']
+               ]
        }
 
        site::linux_module { 'dm_snapshot': }

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 912cfd6..7dc5f73 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -13,14 +13,22 @@ class debian-org {
                        'sysklogd',
                        'rsyslog',
                ]:
-                       ensure => purged,
+               ensure => purged,
+       }
+       package { [
+                       'debian.org',
+                       'dsa-munin-plugins',
+               ]:
+               ensure => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/db.debian.org.list'],
+                       Exec['apt-get update']
+               ]
        }
        package { [
                        'apt-utils',
                        'bash-completion',
-                       'debian.org',
                        'dnsutils',
-                       'dsa-munin-plugins',
                        'less',
                        'lsb-release',
                        'libfilesystem-ruby1.8',
@@ -29,7 +37,7 @@ class debian-org {
                        'nload',
                        'pciutils',
                ]:
-                       ensure => installed,
+               ensure => installed,
        }
 
        munin::check { [
@@ -54,7 +62,11 @@ class debian-org {
 
        if getfromhash($site::nodeinfo, 'broken-rtc') {
                package { 'fake-hwclock':
-                       ensure => installed
+                       ensure => installed,
+                       require => [
+                               File['/etc/apt/sources.list.d/db.debian.org.list'],
+                               Exec['apt-get update']
+                       ]
                }
        }
 

diff --git a/modules/debian-org/manifests/proliant.pp b/modules/debian-org/manifests/proliant.pp
index 04b9cdd..7b998cb 100644 (file)
--- a/modules/debian-org/manifests/proliant.pp
+++ b/modules/debian-org/manifests/proliant.pp
@@ -5,10 +5,18 @@ class debian-org::proliant {
        }
 
        package { 'hpacucli':
-               ensure => installed,
+               ensure  => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/debian.restricted.list'],
+                       Exec['apt-get update']
+               ]
        }
        package { 'hp-health':
                ensure => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/debian.restricted.list'],
+                       Exec['apt-get update']
+               ]
        }
        package { 'arrayprobe':
                ensure => installed,
@@ -26,5 +34,3 @@ class debian-org::proliant {
                }
        }
 }
-
-

diff --git a/modules/megactl/manifests/init.pp b/modules/megactl/manifests/init.pp
index 3c37663..e504972 100644 (file)
--- a/modules/megactl/manifests/init.pp
+++ b/modules/megactl/manifests/init.pp
@@ -1,6 +1,10 @@
 class megactl {
        package { 'megactl':
-               ensure => installed
+               ensure => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/debian.restricted.list'],
+                       Exec['apt-get update']
+               ]
        }
 
        site::aptrepo { 'debian.restricted':

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 0e84474..9ea7b33 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -4,7 +4,11 @@ class nagios::client inherits nagios {
                ensure => purged
        }
        package { 'dsa-nagios-checks':
-               ensure => installed
+               ensure => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/db.debian.org.list'],
+                       Exec['apt-get update']
+               ]
        }
 
        service { 'nagios-nrpe-server':