haproxy v1.0.2, fix regression introduced in v1.0.1

fizo · Jun 8, 2011 · 0981c2e · 0981c2e
1 parent 7794acd
commit 0981c2e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/haproxy/README.md b/haproxy/README.md
@@ -6,6 +6,14 @@ Installs haproxy and prepares the configuration location.
 Changes
 =======
 
+## v1.0.2:
+
+* fix regression introduced in v1.0.1
+
+## v1.0.1:
+
+* account for the case where load balancer is in the pool
+
 ## v1.0.0:
 
 * Use `node.chef_environment` instead of `node['app_environment']`

diff --git a/haproxy/metadata.rb b/haproxy/metadata.rb
@@ -3,7 +3,7 @@
 license           "Apache 2.0"
 description       "Installs and configures haproxy"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           "1.0.1"
+version           "1.0.2"
 
 recipe "haproxy", "Installs and configures haproxy"
 recipe "haproxy::app_lb", "Installs and configures haproxy by searching for nodes of a particular role"

diff --git a/haproxy/recipes/app_lb.rb b/haproxy/recipes/app_lb.rb
@@ -17,12 +17,11 @@
 # limitations under the License.
 #
 
-pool_members = []
-# if we are the load balancer and pool
+pool_members = search("node", "role:#{node['haproxy']['app_server_role']} AND chef_environment:#{node.chef_environment}") || []
+
+# load balancer is in the pool
 if node.run_list.roles.include?(node['haproxy']['app_server_role'])
   pool_members << node
-else
-  pool_members << search("node", "role:#{node['haproxy']['app_server_role']} AND chef_environment:#{node.chef_environment}")
 end
 
 package "haproxy" do
@@ -46,6 +45,6 @@
   owner "root"
   group "root"
   mode 0644
-  variables :pool_members => pool_members
+  variables :pool_members => pool_members.uniq
   notifies :restart, "service[haproxy]"
 end