summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorR. Tyler Croy <tyler@monkeypox.org>2012-07-08 21:38:34 -0700
committerR. Tyler Croy <tyler@monkeypox.org>2012-07-08 21:38:50 -0700
commitc409a0953552107f4ad4c6535392071980d9e33b (patch)
tree13dba3ce794a59f4a05e13930eda76df129c86ae /tests
parentf9e56b6d4308da2b298b6b616313ecc553a5b6dc (diff)
Fix some, but by no means all, of puppet-lint's complaining
Diffstat (limited to 'tests')
-rw-r--r--tests/init.pp32
1 files changed, 19 insertions, 13 deletions
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']
+ },
}
-