summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp/manifests
diff options
context:
space:
mode:
authorChristoph <chris@inferno.nadir.org>2014-05-22 10:37:32 +0200
committerChristoph <chris@inferno.nadir.org>2014-05-22 11:26:58 +0200
commit752f980d1cc45d4cd617675722feedc286739878 (patch)
tree57de90f035141143773fd7bc167134605025729b /puppet/modules/site_webapp/manifests
parent0755757cd57679a946631411163eb61010215cb5 (diff)
fix haproxy config if webapp and mx run on the same host
the problem was, that both site_mx::haproxy and site_webapp::haproxy declared the same resource. I fixed it by moving that resource to site_haproxy. Since that gets included by both classes, everything works like a charm
Diffstat (limited to 'puppet/modules/site_webapp/manifests')
-rw-r--r--puppet/modules/site_webapp/manifests/haproxy.pp8
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/modules/site_webapp/manifests/haproxy.pp b/puppet/modules/site_webapp/manifests/haproxy.pp
index b69c69da..e956f71f 100644
--- a/puppet/modules/site_webapp/manifests/haproxy.pp
+++ b/puppet/modules/site_webapp/manifests/haproxy.pp
@@ -2,12 +2,4 @@ class site_webapp::haproxy {
include site_haproxy
- $haproxy = hiera('haproxy')
-
- # Template uses $global_options, $defaults_options
- concat::fragment { 'leap_haproxy_webapp_couchdb':
- target => '/etc/haproxy/haproxy.cfg',
- order => '20',
- content => template('site_webapp/haproxy_couchdb.cfg.erb'),
- }
}