summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-02-12 13:45:20 -0500
committerMicah Anderson <micah@riseup.net>2013-02-12 14:06:16 -0500
commit2e03ec8c02a54c407c12964d243ba4ac5de15b99 (patch)
tree2304952730bf638089fd94f469dfe3ecff1a65b5 /puppet
parent2fd403476e77a545355443667408ba0cf6205fcd (diff)
switch to using stdlib's standard stages
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/site.pp4
-rw-r--r--puppet/modules/site_config/manifests/default.pp2
-rw-r--r--puppet/modules/site_config/manifests/slow.pp2
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp2
4 files changed, 4 insertions, 6 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 1ec806d9..c89bc7d1 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,9 +1,7 @@
# set a default exec path
Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
-stage { 'initial':
- before => Stage['main'],
-}
+include stdlib
import 'common'
include site_config::default
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 2191e9a1..77241df5 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -24,7 +24,7 @@ class site_config::default {
# configure /etc/hosts
class { 'site_config::hosts':
- stage => initial,
+ stage => setup,
}
package { [ 'etckeeper' ]:
diff --git a/puppet/modules/site_config/manifests/slow.pp b/puppet/modules/site_config/manifests/slow.pp
index 18b22a9c..94bac88d 100644
--- a/puppet/modules/site_config/manifests/slow.pp
+++ b/puppet/modules/site_config/manifests/slow.pp
@@ -1,6 +1,6 @@
class site_config::slow {
tag 'leap_slow'
class { 'site_apt::dist_upgrade':
- stage => initial,
+ stage => setup,
}
}
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index c98a8a1f..c114a39a 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -2,7 +2,7 @@ class site_nagios::server inherits nagios::base {
# First, purge old nagios config (see #1467)
class { 'site_nagios::server::purge':
- stage => initial
+ stage => setup
}
$nagios_hiera=hiera('nagios')