diff options
| author | R. Tyler Croy <tyler@monkeypox.org> | 2012-07-08 21:38:34 -0700 |
|---|---|---|
| committer | R. Tyler Croy <tyler@monkeypox.org> | 2012-07-08 21:38:50 -0700 |
| commit | c409a0953552107f4ad4c6535392071980d9e33b (patch) | |
| tree | 13dba3ce794a59f4a05e13930eda76df129c86ae | |
| parent | f9e56b6d4308da2b298b6b616313ecc553a5b6dc (diff) | |
Fix some, but by no means all, of puppet-lint's complaining
| -rw-r--r-- | manifests/balancermember.pp | 2 | ||||
| -rw-r--r-- | manifests/config.pp | 7 | ||||
| -rw-r--r-- | manifests/init.pp | 17 | ||||
| -rw-r--r-- | tests/init.pp | 32 |
4 files changed, 36 insertions, 22 deletions
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp index 50e90c0..29fb382 100644 --- a/manifests/balancermember.pp +++ b/manifests/balancermember.pp @@ -21,7 +21,7 @@ # fragment name. # # [*listening_service*] -# The haproxy service's instance name (or, the title of the +# The haproxy service's instance name (or, the title of the # haproxy::config resource). This must match up with a declared # haproxy::config resource. # diff --git a/manifests/config.pp b/manifests/config.pp index fba4f33..5825dd0 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -51,7 +51,8 @@ # virtual_ip => $::ipaddress, # virtual_ip_port => '18140', # mode => 'tcp', -# haproxy_config_options => {'option' => ['tcplog', 'ssl-hello-chk'], 'balance' => 'roundrobin'}, +# haproxy_config_options => {'option' => ['tcplog', 'ssl-hello-chk'], +# 'balance' => 'roundrobin'}, # } # # === Authors @@ -63,7 +64,9 @@ define haproxy::config ( $order = '20', $virtual_ip = $::ipaddress, $mode = 'tcp', - $haproxy_config_options = {'option' => ['tcplog', 'ssl-hello-chk'], 'balance' => 'roundrobin'}, + $haproxy_config_options = {'option' => ['tcplog', + 'ssl-hello-chk'], + 'balance' => 'roundrobin'}, ) { concat::fragment { "${name}_config_block": order => $order, diff --git a/manifests/init.pp b/manifests/init.pp index a0f5265..8005aec 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -45,7 +45,12 @@ # 'stats' => 'enable', # 'option' => 'redispatch', # 'retries' => '3', -# 'timeout' => ['http-request 10s', 'queue 1m', 'connect 10s', 'client 1m', 'server 1m', 'check 10s'], +# 'timeout' => ['http-request 10s', +# 'queue 1m', +# 'connect 10s', +# 'client 1m', +# 'server 1m', +# 'check 10s'], # 'maxconn' => '8000' # }, # @@ -63,13 +68,13 @@ class haproxy ( include concat::setup package { 'haproxy': - ensure => $enable ? { + ensure => $enable ? { true => present, false => absent, }, - name => 'haproxy', + name => 'haproxy', } - + if $enable { concat { '/etc/haproxy/haproxy.cfg': owner => '0', @@ -95,11 +100,11 @@ class haproxy ( } service { 'haproxy': - ensure => $enable ? { + ensure => $enable ? { true => running, false => stopped, }, - enable => $enable ? { + enable => $enable ? { true => true, false => false, }, 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'] + }, } - |