From cce9af1fce42c29bf062cccfc46ef356d83a6328 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 23 Feb 2017 11:42:47 +0100
Subject: [8144] Remove Haproxy

We used haproxy because we had multiple bigcouch nodes but now
with a single couchdb node this is not needed anymore.

- Resolves: #8144
---
 .../modules/site_haproxy/files/haproxy-stats.cfg   |  6 ----
 puppet/modules/site_haproxy/manifests/init.pp      | 41 ----------------------
 puppet/modules/site_haproxy/templates/couch.erb    | 32 -----------------
 .../modules/site_haproxy/templates/haproxy.cfg.erb | 11 ------
 4 files changed, 90 deletions(-)
 delete mode 100644 puppet/modules/site_haproxy/files/haproxy-stats.cfg
 delete mode 100644 puppet/modules/site_haproxy/manifests/init.pp
 delete mode 100644 puppet/modules/site_haproxy/templates/couch.erb
 delete mode 100644 puppet/modules/site_haproxy/templates/haproxy.cfg.erb

(limited to 'puppet/modules/site_haproxy')

diff --git a/puppet/modules/site_haproxy/files/haproxy-stats.cfg b/puppet/modules/site_haproxy/files/haproxy-stats.cfg
deleted file mode 100644
index e6335ba2..00000000
--- a/puppet/modules/site_haproxy/files/haproxy-stats.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# provide access to stats for the nagios plugin
-listen stats 127.0.0.1:8000
-    mode http
-    stats enable
-    stats uri /haproxy
-
diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp
deleted file mode 100644
index b28ce80e..00000000
--- a/puppet/modules/site_haproxy/manifests/init.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-class site_haproxy {
-    $haproxy     = hiera('haproxy')
-
-    class { 'haproxy':
-      enable           => true,
-      manage_service   => true,
-      global_options   => {
-        'log'     => '127.0.0.1 local0',
-        'maxconn' => '4096',
-        'stats'   => 'socket /var/run/haproxy.sock user haproxy group haproxy',
-        'chroot'  => '/usr/share/haproxy',
-        'user'    => 'haproxy',
-        'group'   => 'haproxy',
-        'daemon'  => ''
-      },
-      defaults_options => {
-        'log'             => 'global',
-        'retries'         => '3',
-        'option'          => 'redispatch',
-        'timeout connect' => '4000',
-        'timeout client'  => '20000',
-        'timeout server'  => '20000'
-      }
-  }
-
-  # monitor haproxy
-  concat::fragment { 'stats':
-    target => '/etc/haproxy/haproxy.cfg',
-    order  => '90',
-    source => 'puppet:///modules/site_haproxy/haproxy-stats.cfg';
-  }
-
-  # Template uses $haproxy
-  concat::fragment { 'leap_haproxy_webapp_couchdb':
-    target  => '/etc/haproxy/haproxy.cfg',
-    order   => '20',
-    content => template('site_haproxy/haproxy.cfg.erb'),
-  }
-
-  include site_check_mk::agent::haproxy
-}
diff --git a/puppet/modules/site_haproxy/templates/couch.erb b/puppet/modules/site_haproxy/templates/couch.erb
deleted file mode 100644
index f42e8368..00000000
--- a/puppet/modules/site_haproxy/templates/couch.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-frontend couch
-  bind localhost:<%= @listen_port %>
-  mode     http
-  option   httplog
-  option   dontlognull
-  option   http-server-close    # use client keep-alive, but close server connection.
-  use_backend couch_read if METH_GET
-  default_backend couch_write
-
-backend couch_write
-  mode http
-  balance  roundrobin
-  option   httpchk GET /        # health check using simple get to root
-  option   allbackups           # balance among all backups, not just one.
-  default-server inter 3000 fastinter 1000 downinter 1000 rise 2 fall 1
-<%- @servers.sort.each do |name,server| -%>
-<%-   next unless server['writable'] -%>
-    # <%=name%>
-    server couchdb_<%=server['port']%> <%=server['host']%>:<%=server['port']%> <%='backup' if server['backup']%> weight <%=server['weight']%> check
-<%- end -%>
-
-backend couch_read
-  mode http
-  balance  roundrobin
-  option   httpchk GET /        # health check using simple get to root
-  option   allbackups           # balance among all backups, not just one.
-  default-server inter 3000 fastinter 1000 downinter 1000 rise 2 fall 1
-<%- @servers.sort.each do |name,server| -%>
-    # <%=name%>
-    server couchdb_<%=server['port']%> <%=server['host']%>:<%=server['port']%> <%='backup' if server['backup']%> weight <%=server['weight']%> check
-<%- end -%>
-
diff --git a/puppet/modules/site_haproxy/templates/haproxy.cfg.erb b/puppet/modules/site_haproxy/templates/haproxy.cfg.erb
deleted file mode 100644
index 8311b1a5..00000000
--- a/puppet/modules/site_haproxy/templates/haproxy.cfg.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<%- @haproxy.each do |frontend, options| -%>
-<%-   if options['servers'] -%>
-
-##
-## <%= frontend %>
-##
-
-<%=     scope.function_templatewlv(["site_haproxy/#{frontend}.erb", options]) %>
-<%-   end -%>
-<%- end -%>
-
-- 
cgit v1.2.3