clean up aptrepo ordering

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index d00197b7345852ad723db7595602cde6a670a51c..efde37bde3198b416226c095ce8c592841305465 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -40,7 +40,6 @@ class buildd {
                suite      => $suite,
                components => 'main',
                require    => Package['apt-transport-https'],
-               before     => Package[schroot,sbuild]
        }
 
        if $::hostname in [alkman,porpora,zandonai] {
@@ -67,7 +66,7 @@ class buildd {
        }
        file { '/etc/apt/preferences.d/buildd':
                content => template('buildd/etc/apt/preferences.d/buildd'),
-               before  => File['/etc/apt/sources.list.d/buildd.debian.org.list']
+               before  => Site::Aptrepo['buildd.debian.org']
        }
        file { '/etc/schroot/mount-defaults':
                content => template('buildd/etc/schroot/mount-defaults.erb'),

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ad592d77771b6887e2ad9c6faf8baaf31f67eb9a..4d7d63f20cfe54b1fcdbabd26c05a5cbcbd45171 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -20,11 +20,8 @@ class 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',
@@ -68,10 +65,6 @@ class debian-org {
        if getfromhash($site::nodeinfo, 'broken-rtc') {
                package { 'fake-hwclock':
                        ensure => installed,
-                       require => [
-                               File['/etc/apt/sources.list.d/db.debian.org.list'],
-                               Exec['apt-get update']
-                       ]
                }
        }
 
@@ -236,6 +229,7 @@ class debian-org {
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                refreshonly => true,
        }
+       Exec['apt-get update']->Package<| |>
 
        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 9c7ec4bfd9c8bbdb1b2245f83460eec3fe00fee1..1dc59f66978a5eff7778a0a43a4e8feead958acb 100644 (file)
--- a/modules/hardware/manifests/raid/megactl.pp
+++ b/modules/hardware/manifests/raid/megactl.pp
@@ -2,10 +2,6 @@ class hardware::raid::megactl {
 
        package { 'megactl':
                ensure => installed,
-               require => [
-                       File['/etc/apt/sources.list.d/debian.restricted.list'],
-                       Exec['apt-get update']
-               ]
        }
 
        site::aptrepo { 'debian.restricted':

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 574d601e7da8d9360d21751b018a4f723b493bb5..993e5de058da6a2060485b5964f0070af72ad880 100644 (file)
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -8,17 +8,9 @@ class hardware::raid::proliant {
 
        package { 'hpacucli':
                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,

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

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index 52036ed9d3f06c8e859676f1621c482a70408378..db6179f10ca01633a0718708cc0fa1c20e6c334a 100644 (file)
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -57,6 +57,6 @@ define site::aptrepo (
        file { "/etc/apt/sources.list.d/${name}.list":
                        ensure  => $ensure,
                        content => template('site/aptrepo.erb'),
-                       notify => Exec['apt-get update'],
+                       notify  => Exec['apt-get update'],
        }
 }