diff options
| author | Christoph <chris@inferno.nadir.org> | 2014-05-22 10:37:32 +0200 |
|---|---|---|
| committer | Christoph <chris@inferno.nadir.org> | 2014-05-22 11:26:58 +0200 |
| commit | 752f980d1cc45d4cd617675722feedc286739878 (patch) | |
| tree | 57de90f035141143773fd7bc167134605025729b /puppet | |
| parent | 0755757cd57679a946631411163eb61010215cb5 (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')
| -rw-r--r-- | puppet/modules/site_haproxy/manifests/init.pp | 10 | ||||
| -rw-r--r-- | puppet/modules/site_mx/manifests/haproxy.pp | 9 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/haproxy.pp | 8 |
3 files changed, 10 insertions, 17 deletions
diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp index 1a681373..144d1ed2 100644 --- a/puppet/modules/site_haproxy/manifests/init.pp +++ b/puppet/modules/site_haproxy/manifests/init.pp @@ -1,4 +1,6 @@ class site_haproxy { + $haproxy = hiera('haproxy') + $local_ports = $haproxy['local_ports'] class { 'haproxy': enable => true, @@ -28,5 +30,13 @@ class site_haproxy { order => '90', source => 'puppet:///modules/site_haproxy/haproxy-stats.cfg'; } + + # Template uses $global_options, $defaults_options and $haproxy + concat::fragment { 'leap_haproxy_webapp_couchdb': + target => '/etc/haproxy/haproxy.cfg', + order => '20', + content => template('site_webapp/haproxy_couchdb.cfg.erb'), + } + include site_check_mk::agent::haproxy } diff --git a/puppet/modules/site_mx/manifests/haproxy.pp b/puppet/modules/site_mx/manifests/haproxy.pp index 988eeaf3..4e5675eb 100644 --- a/puppet/modules/site_mx/manifests/haproxy.pp +++ b/puppet/modules/site_mx/manifests/haproxy.pp @@ -2,13 +2,4 @@ class site_mx::haproxy { include site_haproxy - $haproxy = hiera('haproxy') - $local_ports = $haproxy['local_ports'] - - # 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'), - } } 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'), - } } |