openstack/fuel-library
Code Issues Proposed changes

FUEL-335. Excluded current hostname from galera gcomm string.

Browse Source
This commit is contained in:
manashkin 2012-12-26 21:31:50 +04:00
parent acd3d1c4e3
commit 7156bc5bd8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/galera/manifests/galera_master_final_config.pp
View File

@ -2,7 +2,7 @@ class galera::galera_master_final_config($master_ip, $node_addresses) {
# This class changes config file on first Galera node to allow safe restart of this node without leaving cluster. # This class changes config file on first Galera node to allow safe restart of this node without leaving cluster.
if ! $master_ip { if ! $master_ip {
$galera_gcomm_string = inline_template("<%= @node_addresses.collect {|ip| ip + ':' + 4567.to_s }.join ',' %>") $galera_gcomm_string = inline_template("<%= @node_addresses.reject{|ip| ip == hostname }.collect {|ip| ip + ':' + 4567.to_s }.join ',' %>")
$check_galera = "show status like 'wsrep_cluster_size';" $check_galera = "show status like 'wsrep_cluster_size';"
$mysql_user = $::galera::params::mysql_user $mysql_user = $::galera::params::mysql_user
$mysql_password = $::galera::params::mysql_password $mysql_password = $::galera::params::mysql_password

4
deployment/puppet/galera/templates/wsrep.cnf.erb
View File

@ -53,9 +53,9 @@ wsrep_provider_options="pc.ignore_sb = no;ist.recv_addr=<%= node_address %>;gmca
wsrep_cluster_name="<%= cluster_name -%>" wsrep_cluster_name="<%= cluster_name -%>"
<% if setup_multiple_gcomm -%> <% if setup_multiple_gcomm -%>
<% if master_ip -%> <% if master_ip -%>
wsrep_cluster_address="gcomm://<%= @node_addresses.collect {|ip| ip + ':' + 4567.to_s }.join ',' %>" wsrep_cluster_address="gcomm://<%= @node_addresses.reject{|ip| ip == hostname }.collect {|ip| ip + ':' + 4567.to_s }.join ',' %>"
<% else -%> <% else -%>
wsrep_cluster_address="gcomm://" wsrep_cluster_address="gcomm://"
<% end -%> <% end -%>
<% else -%> <% else -%>
<% if master_ip -%> <% if master_ip -%>