Merge branch '8144_remove_haproxy' into 'master'

8144 remove haproxy

Closes #8144

See merge request !70

1 files changed, 0 insertions, 69 deletions

diff --git a/puppet/modules/haproxy/tests/init.pp b/puppet/modules/haproxy/tests/init.pp
deleted file mode 100644
index 77590ac8..00000000
--- a/puppet/modules/haproxy/tests/init.pp
+++ /dev/null
@@ -1,69 +0,0 @@
-# Declare haproxy base class with configuration options
-class { 'haproxy':
-  enable           => true,
-  global_options   => {
-    'log'     => "${::ipaddress} local0",
-    'chroot'  => '/var/lib/haproxy',
-    'pidfile' => '/var/run/haproxy.pid',
-    'maxconn' => '4000',
-    'user'    => 'haproxy',
-    'group'   => 'haproxy',
-    'daemon'  => '',
-    'stats'   => 'socket /var/lib/haproxy/stats',
-  },
-  defaults_options => {
-    'log'     => 'global',
-    'stats'   => 'enable',
-    'option'  => 'redispatch',
-    'retries' => '3',
-    'timeout' => [
-      'http-request 10s',
-      'queue 1m',
-      'connect 10s',
-      'client 1m',
-      'server 1m',
-      'check 10s',
-    ],
-    'maxconn' => '8000',
-  },
-}
-
-# Export a balancermember server, note that the listening_service parameter
-#  will/must correlate with an haproxy::listen defined resource type.
-@@haproxy::balancermember { $fqdn:
-  order                  => '21',
-  listening_service      => 'puppet00',
-  server_name            => $::hostname,
-  balancer_ip            => $::ipaddress,
-  balancer_port          => '8140',
-  balancermember_options => 'check'
-}
-
-# Declare a couple of Listening Services for haproxy.cfg
-#  Note that the balancermember server resources are being collected in
-#  the haproxy::config defined resource type with the following line:
-#  Haproxy::Balancermember <<| listening_service == $name |>>
-haproxy::listen { 'puppet00':
-  order     => '20',
-  ipaddress => $::ipaddress,
-  ports     => '18140',
-  options   => {
-    'option'  => [
-      'tcplog',
-      'ssl-hello-chk',
-    ],
-    'balance' => 'roundrobin',
-  },
-}
-haproxy::listen { 'stats':
-  order     => '30',
-  ipaddress => '',
-  ports     => '9090',
-  options   => {
-    'mode'  => 'http',
-    'stats' => [
-      'uri /',
-      'auth puppet:puppet'
-    ],
-  },
-}