diff options
author | Hunter Haugen <h.haugen@gmail.com> | 2012-10-12 11:28:24 -0700 |
---|---|---|
committer | Hunter Haugen <h.haugen@gmail.com> | 2012-10-12 11:32:01 -0700 |
commit | 3ab65f56a61cfedbe75a3b41143f0d44fbad0a93 (patch) | |
tree | 1318b8a2daf4ab737d4e01b85328315a2df926ac /tests | |
parent | f96656440027fbfc73bccf1911c817d7e4392713 (diff) |
Rename everything!
What is renamed:
- Class/define:
- haproxy::config to haproxy::listen
- haproxy::data to haproxy::params
- Parameters:
- haproxy::listen listen_ip to ipaddress
- haproxy::listen config_options to options
- haproxy haproxy_global_options to global_options
- haproxy haproxy_defaults_options to defaults_options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/init.pp | 83 |
1 files changed, 48 insertions, 35 deletions
diff --git a/tests/init.pp b/tests/init.pp index f27f809..77590ac 100644 --- a/tests/init.pp +++ b/tests/init.pp @@ -1,31 +1,35 @@ # Declare haproxy base class with configuration options class { 'haproxy': - enable => true, - haproxy_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' - }, - 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' - }, + 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::config defined resource type. +# will/must correlate with an haproxy::listen defined resource type. @@haproxy::balancermember { $fqdn: order => '21', listening_service => 'puppet00', @@ -39,18 +43,27 @@ class { 'haproxy': # 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::config { 'puppet00': - order => '20', - virtual_ip => $::ipaddress, - virtual_ip_port => '18140', - haproxy_config_options => { - 'option' => ['tcplog', 'ssl-hello-chk'], 'balance' => 'roundrobin' }, +haproxy::listen { 'puppet00': + order => '20', + ipaddress => $::ipaddress, + ports => '18140', + 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::listen { 'stats': + order => '30', + ipaddress => '', + ports => '9090', + options => { + 'mode' => 'http', + 'stats' => [ + 'uri /', + 'auth puppet:puppet' + ], }, } |