summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-01-29 16:39:23 +0100
committervarac <varacanero@zeromail.org>2013-01-29 16:39:23 +0100
commitd0bec7ba086aadefba3655509db6c5b25b116bfb (patch)
tree4a4784123dc95fb45475d5a901624d31b312a65f /puppet
parentbe81edd7aa5e35c9bd79cd77946e6e7d17288bee (diff)
run stage declaration moved to site.pp
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/site.pp6
-rw-r--r--puppet/modules/site_config/manifests/init.pp6
2 files changed, 6 insertions, 6 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 1a76e3bd..33566f0c 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,6 +1,10 @@
# set a default exec path
Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
+stage { 'initial':
+ before => Stage['main'],
+}
+
node 'default' {
# prerequisites
import 'common'
@@ -11,7 +15,7 @@ node 'default' {
# include some basic classes
include site_config
} else {
- notice ('NOT applying site_config')
+ notice ('NOT applying site_config')
}
# parse services for host
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/init.pp
index c27074ed..f0ce9856 100644
--- a/puppet/modules/site_config/manifests/init.pp
+++ b/puppet/modules/site_config/manifests/init.pp
@@ -17,12 +17,8 @@ class site_config {
# configure caching, local resolver
include site_config::caching_resolver
-
- # configure /etc/hosts
- stage { 'initial':
- before => Stage['main'],
- }
+ # configure /etc/hosts
class { 'site_config::hosts':
stage => initial,
}