Merge pull request #1275 from cbaenziger/mysql_vip_fix

LGTM

Author: leochen4891

cookbooks/bcpc/attributes/apache2.rb

@@ -13,6 +13,16 @@
 
   # extra files to be exposed
   bach_web['files_url'] = 'files'
+
+  # links to services (an hash of hashes with structure:
+  # <name>=>{'desc':<desc> and 'url':<url>} to be listed)
+  bach_web['links'] = {}
+  # files to be served from nodes
+  # <name>=>{'desc':<desc> and 'path':<file>} to be listed)
+  # note: file needs to be under the document_root/files directory
+  bach_web['files'] = {}
+  # <name>=>{'desc':<desc> and 'port':<port>} to be listed)
+  bach_web['files'] = {}
 end
 
 # haproxy

cookbooks/bcpc/recipes/haproxy.rb

@@ -57,8 +57,9 @@
   service.merge({
     'servers' => get_nodes_for(service['servers_recipe'], service['servers_cookbook']).map { |hst|
       {
-        'fqdn' => float_host(hst['fqdn']),
-        'ip' => hst['bcpc']['floating']['ip'],
+        'fqdn' => hst['fqdn'],
+        'floating_fqdn' => float_host(hst['fqdn']),
+        'floating_ip' => hst['bcpc']['floating']['ip'],
         'port' => service['servers_port']
       }
     }
@@ -67,17 +68,19 @@
 
 mysql_servers = get_nodes_for("mysql","bcpc").collect { |hst|
   {
-    'fqdn' => float_host(hst['fqdn']),
-    'ip' => hst['bcpc']['floating']['ip']
+    'fqdn' => hst['fqdn'],
+    'ip' => hst['bcpc']['management']['ip']
   }
 }
 
 template "/etc/haproxy/haproxy.cfg" do
   source "haproxy.cfg.erb"
   mode 00644
   variables(:mysql_servers => mysql_servers,
-            :cluster_vip => node['bcpc']['floating']['vip'],
-            :local_ip => node['bcpc']['floating']['ip'],
+            :floating_vip => node['bcpc']['floating']['vip'],
+            :management_vip => node['bcpc']['management']['vip'],
+            :local_management_ip => node['bcpc']['management']['ip'],
+            :local_floating_ip => node['bcpc']['floating']['ip'],
             :haproxy_stats_user => get_config('haproxy-stats-user'),
             :haproxy_stats_pwd => get_config!('password',"haproxy-stats","os"),
             :haproxy_tune_chksize => node['bcpc']['haproxy']['tune_chksize'],

cookbooks/bcpc/templates/default/haproxy.cfg.erb

@@ -16,7 +16,7 @@ global
 defaults
   log  global
   maxconn  8000
-  source <%= @local_ip %>
+  source <%= @local_management_ip %>
   mode  http
   option abortonclose
   option tcplog
@@ -31,25 +31,25 @@ defaults
   timeout  client 30m
   timeout  server 30m
 
-listen stats <%= @local_ip%>:1936
+listen stats <%= @local_management_ip%>:1936
   mode http
   stats enable
   stats uri /
   stats hide-version
   stats realm Haproxy\ Statistics
   stats auth <%= "#{@haproxy_stats_user}:#{@haproxy_stats_pwd}" %>
 
-listen stats-vip <%= @cluster_vip%>:1936
+listen stats-vip <%= @management_vip%>:1936
   mode http
-  server myself <%= @local_ip %>:1936
+  server myself <%= @local_management_ip %>:1936
 
-listen memcached <%= @cluster_vip %>:11211
+listen memcached <%= @management_vip %>:11211
   mode tcp
   option tcpka
   server myself 127.0.0.1:11211
 
 <% if @mysql_servers.length > 0 -%>
-listen mysql-galera <%= @cluster_vip %>:3306
+listen mysql-galera <%= @management_vip %>:3306
   timeout  client 24h
   timeout  server 24h
   mode tcp
@@ -63,15 +63,15 @@ listen mysql-galera <%= @cluster_vip %>:3306
 <% end -%>
 
 <% @ha_services.each do |service| -%>
-listen <%= "#{service['name']} #{@cluster_vip}:#{service['port']}" %>
+listen <%= "#{service['name']} #{@floating_vip}:#{service['port']}" %>
   balance roundrobin
   <% if !service['http_check_url'].nil? and !service['http_check_expect_str'].nil? -%>
   option httpchk GET <%= service['http_check_url'] %>
   http-check expect string <%= service['http_check_expect_str'] %>
   <% end -%>
-  source <%= @local_ip %>
+  source <%= @local_floating_ip %>
   <% service['servers'].each do |server| -%>
-  <%= "server #{server['fqdn']} #{server['ip']}:#{server['port']} check" %>
+  <%= "server #{server['floating_fqdn']} #{server['floating_ip']}:#{server['port']} check" %>
   <% end -%>
 
 <% end -%>