From c409a0953552107f4ad4c6535392071980d9e33b Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Sun, 8 Jul 2012 21:38:34 -0700 Subject: Fix some, but by no means all, of puppet-lint's complaining --- tests/init.pp | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/init.pp b/tests/init.pp index 32c32c7..f27f809 100644 --- a/tests/init.pp +++ b/tests/init.pp @@ -1,7 +1,7 @@ # Declare haproxy base class with configuration options class { 'haproxy': - enable => true, - haproxy_global_options => { 'log' => "${::ipaddress} local0", + enable => true, + haproxy_global_options => {'log' => "${::ipaddress} local0", 'chroot' => '/var/lib/haproxy', 'pidfile' => '/var/run/haproxy.pid', 'maxconn' => '4000', @@ -10,14 +10,18 @@ class { 'haproxy': 'daemon' => '', 'stats' => 'socket /var/lib/haproxy/stats' }, - haproxy_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' - }, - + haproxy_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 @@ -39,12 +43,14 @@ haproxy::config { 'puppet00': order => '20', virtual_ip => $::ipaddress, virtual_ip_port => '18140', - haproxy_config_options => { 'option' => ['tcplog', 'ssl-hello-chk'], 'balance' => 'roundrobin' }, + haproxy_config_options => { + 'option' => ['tcplog', 'ssl-hello-chk'], 'balance' => 'roundrobin' }, } haproxy::config { 'stats': order => '30', virtual_ip => '', virtual_ip_port => '9090', - haproxy_config_options => { 'mode' => 'http', 'stats' => ['uri /', 'auth puppet:puppet'] }, + haproxy_config_options => { 'mode' => 'http', + 'stats' => ['uri /', 'auth puppet:puppet'] + }, } - -- cgit v1.2.3