try to order these a bit

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 3aa5990985c37b4d78987b6c29701b2953db822e..9c714a5c3e0cdb23840ec384ba1e7322f959aaef 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,5 +1,6 @@
 Package {
-       require => File['/etc/apt/apt.conf.d/local-recommends']
+       require => File['/etc/apt/apt.conf.d/local-recommends'],
+       stage   => deploy_infra
 }
 
 File {

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 1de4f3377e5b99d65f0e4c5a7d0a1ae8c40df1bf..6bd381e104576f409669928ff55f72dc891227f1 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -7,13 +7,16 @@ class buildd {
                package { 'schroot': ensure => held }
        }
 
+       package { 'apt-transport-https':
+               ensure => installed,
+               stage  => setup,
+       }
        package { [
                        'sbuild',
-                       'apt-transport-https',
                        'debootstrap',
                        'dupload'
                ]:
-                       ensure => installed
+               ensure => installed
        }
 
        site::linux_module { 'dm_snapshot': }

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 912cfd616f9f2383133518be8571668e49f19a94..c3488e503c0dbb233cfd5d58b2a91d2a5a358371 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -179,6 +179,7 @@ class debian-org {
 
        exec { 'apt-get update':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+               stage       => setup_infra,
                refreshonly => true,
        }
 

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index d0e34ecaf8dddfcb6145725186f4013a8b93d817..b71c5fa25c3f4289a81b889c8767de97a7cbc971 100644 (file)
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,17 +1,18 @@
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present, $require = []) {
-
+define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
 
        case $ensure {
                present: {
                        if $key {
                                exec { "apt-key-update-${name}":
                                        command     => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
+                                       stage       => setup,
                                        refreshonly => true,
                                }
 
                                file { "/etc/apt/trusted-keys.d/${name}.asc":
                                        source => $key,
                                        mode   => '0664',
+                                       stage  => setup,
                                        notify => Exec["apt-key-update-${name}"]
                                }
                        }
@@ -20,19 +21,23 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
                        if ($keyid) and ($key) {
                                file { "/etc/apt/trusted-keys.d/${name}.asc":
                                        ensure => absent,
+                                       stage  => setup,
                                        notify => Exec["apt-key-del-${keyid}"]
                                }
                                exec { "apt-key-del-${keyid}":
                                        command     => "apt-key del ${keyid}",
+                                       stage       => setup,
                                        refreshonly => true,
                                }
                        } elsif $key {
                                file { "/etc/apt/trusted-keys.d/${name}.asc":
                                        ensure => absent,
+                                       stage  => setup,
                                }
                        } elsif $keyid {
                                exec { "apt-key-del-${keyid}":
-                                       command     => "apt-key del ${keyid}",
+                                       command => "apt-key del ${keyid}",
+                                       stage   => setup,
                                }
                        }
                }
@@ -49,15 +54,13 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
                file { "/etc/apt/sources.list.d/${name}.list":
                        ensure  => $ensure,
                        content => template($template),
-                       notify => Exec['apt-get update'],
-                       require => $require,
+                       notify  => Exec['apt-get update'],
                }
        } else {
                file { "/etc/apt/sources.list.d/${name}.list":
-                       ensure => $ensure,
-                       source => $config,
-                       notify => Exec['apt-get update'],
-                       require => $require,
+                       ensure  => $ensure,
+                       source  => $config,
+                       notify  => Exec['apt-get update'],
                }
        }
 }