From 752f980d1cc45d4cd617675722feedc286739878 Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 22 May 2014 10:37:32 +0200 Subject: 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 --- puppet/modules/site_mx/manifests/haproxy.pp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'puppet/modules/site_mx/manifests') 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'), - } } -- cgit v1.2.3 From 692359e1bb9e5101c3ba882e5b9d3de1c4c63716 Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 22 May 2014 10:46:58 +0200 Subject: remove old classes site_mx::haproxy and site_webapp::haproxy only included site_haproxy. They didn't do anything else. So just include site_haproxy in manifests/init.pp and remove the unused classes --- puppet/modules/site_mx/manifests/haproxy.pp | 5 ----- puppet/modules/site_mx/manifests/init.pp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 puppet/modules/site_mx/manifests/haproxy.pp (limited to 'puppet/modules/site_mx/manifests') diff --git a/puppet/modules/site_mx/manifests/haproxy.pp b/puppet/modules/site_mx/manifests/haproxy.pp deleted file mode 100644 index 4e5675eb..00000000 --- a/puppet/modules/site_mx/manifests/haproxy.pp +++ /dev/null @@ -1,5 +0,0 @@ -class site_mx::haproxy { - - include site_haproxy - -} diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp index 3949c787..c3d38a46 100644 --- a/puppet/modules/site_mx/manifests/init.pp +++ b/puppet/modules/site_mx/manifests/init.pp @@ -10,7 +10,7 @@ class site_mx { include site_postfix::mx - include site_mx::haproxy + include site_haproxy include site_shorewall::mx include site_shorewall::service::smtp include site_mx::couchdb -- cgit v1.2.3