Fix [FUEL-198] for essex.
Multiple gcomm disabled by default
This commit is contained in:
parent
4314313777
commit
94b9f1d245
@ -8,7 +8,7 @@
|
||||
# vi /etc/mysql/conf.d/wsrep.cnf
|
||||
# /etc/init.d/mysql start
|
||||
#
|
||||
class galera($cluster_name, $master_ip = false, $node_address = $ipaddress_eth0) {
|
||||
class galera($cluster_name, $master_ip = false, $node_address = $ipaddress_eth0, $setup_multiple_gcomm = false, $node_addresses=[$ipaddress_eth0]) {
|
||||
|
||||
include galera::params
|
||||
|
||||
|
@ -48,13 +48,16 @@ wsrep_provider_options="pc.ignore_sb = no"
|
||||
|
||||
# Logical cluster name. Should be the same for all nodes.
|
||||
wsrep_cluster_name="<%= cluster_name -%>"
|
||||
|
||||
# Group communication system handle
|
||||
<% if setup_multiple_gcomm -%>
|
||||
wsrep_cluster_address="gcomm://<%= @node_addresses.collect {|ip| ip + ':' + 4567 }.join ',' %>"
|
||||
<% else -%>
|
||||
<% if master_ip -%>
|
||||
wsrep_cluster_address="gcomm://<%= master_ip %>:4567"
|
||||
<% else -%>
|
||||
wsrep_cluster_address="gcomm://"
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
||||
|
||||
# Human-readable node name (non-unique). Hostname by default.
|
||||
#wsrep_node_name=
|
||||
|
@ -24,7 +24,8 @@ class mysql::server (
|
||||
$enabled = true,
|
||||
$galera_cluster_name = undef,
|
||||
$galera_master_ip = undef,
|
||||
$galera_node_address = undef
|
||||
$galera_node_address = undef,
|
||||
$galera_nodes = undef
|
||||
) inherits mysql::params {
|
||||
|
||||
if ($custom_setup_class == undef) {
|
||||
@ -50,6 +51,7 @@ class mysql::server (
|
||||
cluster_name => $galera_cluster_name,
|
||||
master_ip => $galera_master_ip,
|
||||
node_address => $galera_node_address,
|
||||
node_addresses => $galera_nodes,
|
||||
}
|
||||
# require($galera_class)
|
||||
}
|
||||
|
@ -99,6 +99,7 @@ node /fuel-0[12]/ {
|
||||
memcached_servers => $controller_hostnames,
|
||||
export_resources => false,
|
||||
glance_backend => $glance_backend,
|
||||
galera_nodes => $controller_hostnames,
|
||||
manage_volumes => $manage_volumes,
|
||||
nv_physical_volume => $nv_physical_volume,
|
||||
}
|
||||
|
@ -104,6 +104,7 @@ class compact_controller {
|
||||
glance_backend => $glance_backend,
|
||||
swift_proxies => $swift_proxies,
|
||||
manage_volumes => $manage_volumes,
|
||||
galera_nodes => $controller_hostnames,
|
||||
nv_physical_volume => $nv_physical_volume,
|
||||
}
|
||||
class { 'swift::keystone::auth':
|
||||
|
@ -104,6 +104,7 @@ node /fuel-0[12]/ inherits swift_base {
|
||||
glance_backend => $glance_backend,
|
||||
swift_proxies => $swift_proxies,
|
||||
manage_volumes => $manage_volumes,
|
||||
galera_nodes => $controller_hostnames,
|
||||
nv_physical_volume => $nv_physical_volume,
|
||||
}
|
||||
|
||||
|
@ -98,6 +98,7 @@ class openstack::controller(
|
||||
$galera_cluster_name = 'openstack',
|
||||
$galera_master_ip = '127.0.0.1',
|
||||
$galera_node_address = '127.0.0.1',
|
||||
$galera_nodes = ['127.0.0.1'],
|
||||
$glance_backend,
|
||||
$manage_volumes = false,
|
||||
$nv_physical_volume = undef,
|
||||
@ -145,6 +146,7 @@ class openstack::controller(
|
||||
galera_cluster_name => $galera_cluster_name,
|
||||
galera_master_ip => $galera_master_ip,
|
||||
galera_node_address => $galera_node_address,
|
||||
galera_nodes => $galera_nodes,
|
||||
enabled => $enabled,
|
||||
custom_setup_class => $custom_mysql_setup_class,
|
||||
}
|
||||
|
@ -84,7 +84,7 @@ class openstack::controller_ha (
|
||||
$keystone_db_password, $keystone_admin_token, $glance_db_password, $glance_user_password,
|
||||
$nova_db_password, $nova_user_password, $rabbit_password, $rabbit_user,
|
||||
$rabbit_nodes, $memcached_servers, $export_resources, $glance_backend='file', $swift_proxies=undef, $manage_volumes = false,
|
||||
$nv_physical_volume = undef,
|
||||
$galera_nodes, $nv_physical_volume = undef,
|
||||
) {
|
||||
|
||||
$which = $::hostname ? { $master_hostname => 0, default => 1 }
|
||||
@ -247,6 +247,7 @@ class openstack::controller_ha (
|
||||
galera_cluster_name => 'openstack',
|
||||
galera_master_ip => $which ? { 0 => false, default => $controller_internal_addresses[$master_hostname] },
|
||||
galera_node_address => $controller_internal_addresses[$::hostname],
|
||||
galera_nodes => $galera_nodes,
|
||||
admin_email => $admin_email,
|
||||
admin_password => $admin_password,
|
||||
keystone_db_password => $keystone_db_password,
|
||||
|
Loading…
Reference in New Issue
Block a user