summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
authorChristoph <chris@inferno.nadir.org>2014-06-03 15:48:35 +0200
committerChristoph <chris@inferno.nadir.org>2014-06-03 15:48:35 +0200
commit2f9f76682c02770f47922435f815177ceec15fd9 (patch)
tree8477086da139dac1c49dc9f93eaa7958415e4e83 /puppet/manifests
parenta590f5f3ca1eb21f761c40979b3c87c0f5310018 (diff)
move hiera from site.pp to site_config::setup
the problem was following: if a host has the webapp service, the template for /etc/hosts adds some stuff. But setup.pp did not ask hiera about the services so "/srv/leap/bin/puppet_command set_hostname" always resets the hostname. Since that gets triggered every time you run "leap deploy" the hostname changes, some services restart, then the hostname changes back and the services restart again. The solution is to get the hiera data before every run.
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/site.pp3
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index f8726fa9..1eafec64 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,9 +1,6 @@
# set a default exec path
Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
-# parse services for host
-$services=join(hiera_array('services', ['']), ' ')
-notice("Services for ${fqdn}: ${services}")
include site_config::setup
include site_config::default