From: Stephen Gran <steve@lobefin.net>
Date: Tue, 1 Jan 2013 20:19:57 +0000 (+0000)
Subject: clean up aptrepo ordering
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=8fd87401b5b7cb84eba0b83c17d07fddb2465d6d

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 d00197b7..efde37bd 100644
--- 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 ad592d77..4d7d63f2 100644
--- 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 9c7ec4bf..1dc59f66 100644
--- 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 574d601e..993e5de0 100644
--- 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 9ea7b339..7c5d6ca5 100644
--- 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 52036ed9..db6179f1 100644
--- 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'],
 	}
 }