summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-14 18:02:47 +0100
committervarac <varacanero@zeromail.org>2013-03-14 18:03:04 +0100
commit0984ad1726a9166d7143fcdee5dd000f715e6150 (patch)
treec81532a0f7d4b39a3f3ea7c2698877e4081cfd51 /puppet/manifests/site.pp
parente358ef4e33cbf9411d57c11d58657331d7ba8a62 (diff)
evalute $services before including site_config::*
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp7
1 files changed, 4 insertions, 3 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 10ea40c6..34c19370 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -3,6 +3,10 @@ Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
$custom_key_dir = 'puppet:///modules/site_apt/keys'
+# parse services for host
+$services=hiera_array('services')
+notice("Services for ${fqdn}: ${services}")
+
# make sure apt is updated before any packages are installed
include apt::update
Package { require => Exec['apt_updated'] }
@@ -13,9 +17,6 @@ import 'common'
include site_config::default
include site_config::slow
-# parse services for host
-$services=hiera_array('services')
-notice("Services for ${fqdn}: ${services}")
# configure eip
if 'openvpn' in $services {