Skip to content

Commit

Permalink
Update haproxy to ed4afef1a5f13c4ae026ef2dd548fdce75affe82
Browse files Browse the repository at this point in the history
ed4afef1a5f13c4ae026ef2dd548fdce75affe82 Merge pull request redhat-openstack#178 from melan/master
0187e63792ad0c06d5790cb12bafeaf7e4e23c0a Merge commit '33ceaf932fb694e54fc3d917580e2c89e40f0ae7'
e44a38a495b4dd4c7a5c8022691f9f49e5dc34eb fixed problems highlighted by puppet-lint

Change-Id: I321a5aca7c520ad7c93931ebf99075ab1a77cc34
  • Loading branch information
xbezdick committed Apr 30, 2015
1 parent b893b70 commit d5ce3cf
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ mod 'gnocchi',
:git => 'https://github.com/stackforge/puppet-gnocchi.git'

mod 'haproxy',
:commit => '33ceaf932fb694e54fc3d917580e2c89e40f0ae7',
:commit => 'ed4afef1a5f13c4ae026ef2dd548fdce75affe82',
:git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'

mod 'heat',
Expand Down
35 changes: 35 additions & 0 deletions haproxy/manifests/peer.pp
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
# == Define Resource Type: haproxy::peer
#
# This type will set up a peer entry inside the peers configuration block in
# /etc/haproxy/haproxy.cfg on the load balancer. Currently, it has the ability to
# specify the instance name, ip address, ports and server_names.
#
# Automatic discovery of peer nodes may be implemented by exporting the peer resource
# for all HAProxy balancer servers that are configured in the same HA block and
# then collecting them on all load balancers.
#
# === Parameters:
#
# [*peers_name*]
# Specifies the peer in which this load balancer needs to be added.
#
# [*server_names*]
# Sets the name of the peer server in the peers configuration block.
# Defaults to the hostname. Can be an array. If this parameter is
# specified as an array, it must be the same length as the
# ipaddresses parameter's array. A peer is created for each pair
# of server\_names and ipaddresses in the array.
#
# [*ensure*]
# Whether to add or remove the peer. Defaults to 'present'.
# Valid values are 'present' and 'absent'.
#
# [*ipaddresses*]
# Specifies the IP address used to contact the peer member server.
# Can be an array. If this parameter is specified as an array it
# must be the same length as the server\_names parameter's array.
# A peer is created for each pair of address and server_name.
#
# [*ports*]
# Sets the port on which the peer is going to share the state.

define haproxy::peer (
$peers_name,
$port,
Expand Down
14 changes: 14 additions & 0 deletions haproxy/manifests/peers.pp
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# == Defined Type: haproxy::peers
#
# This type will set up a peers entry in /etc/haproxy/haproxy.cfg
# on the load balancer. This setting is required to share the
# current state of HAproxy with other HAproxy in High available
# configurations.
#
# === Parameters
#
# [*name*]
# Sets the peers' name. Generally it will be the namevar of the
# defined resource type. This value appears right after the
# 'peers' statement in haproxy.cfg

define haproxy::peers (
$collect_exported = true,
) {
Expand Down

0 comments on commit d5ce3cf

Please sign in to comment.