Update haproxy to d89fad1c32cba514298c7eb2b82705a997f472f4

d89fad1c32cba514298c7eb2b82705a997f472f4 Merge pull request redhat-openstack#181 from puppetlabs/modulesync_updates
a33a0529fe25beec957bb8b1366d213c7e1e4812 beaker gemfile fixes
5de6c34a4a7e73dc154bd20e45b756730931935a sync via modulesync
79c1458c917e7070ebc62f57258bcfba27e206d4 sync via modulesync
ed4afef1a5f13c4ae026ef2dd548fdce75affe82 Merge pull request redhat-openstack#178 from melan/master
0187e63792ad0c06d5790cb12bafeaf7e4e23c0a Merge commit '33ceaf932fb694e54fc3d917580e2c89e40f0ae7'
e44a38a495b4dd4c7a5c8022691f9f49e5dc34eb fixed problems highlighted by puppet-lint

Change-Id: I1e0f7be213e570d310e2d0e7ac9f925f8cd8b706

Puppetfile

@@ -55,7 +55,7 @@ mod 'gnocchi',
   :git => 'https://github.com/stackforge/puppet-gnocchi.git'
 
 mod 'haproxy',
-  :commit => '33ceaf932fb694e54fc3d917580e2c89e40f0ae7',
+  :commit => 'd89fad1c32cba514298c7eb2b82705a997f472f4',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',

haproxy/.gitignore

@@ -1,5 +1,4 @@
 pkg/
-log/
 Gemfile.lock
 vendor/
 spec/fixtures/

haproxy/.travis.yml

@@ -6,18 +6,12 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
   - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
   - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 1.8.7

haproxy/Gemfile

@@ -18,20 +18,20 @@ group :development, :unit_tests do
   gem 'json',                    :require => false
 end
 
-beaker_version = ENV['BEAKER_VERSION']
-beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
 group :system_tests do
-  if beaker_version
+  if beaker_version = ENV['BEAKER_VERSION']
     gem 'beaker', *location_for(beaker_version)
   end
-  if beaker_rspec_version
+  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',    :require => false
 end
 
+
+
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else

haproxy/manifests/peer.pp

@@ -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,

haproxy/manifests/peers.pp

@@ -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,
 ) {