openstack
/
fuel-library
Code Issues Proposed changes

Merge "Fix [FUEL-198] for essex."

This commit is contained in:
Eugene Kirpichev 2012-11-27 16:00:13 +04:00 committed by Gerrit Code Review
parent 810c2911d8 94b9f1d245
commit e1ef26a2e1
8 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -48,14 +48,17 @@ 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 master_ip -%>
wsrep_cluster_address="gcomm://<%= master_ip %>:4567"
<% if setup_multiple_gcomm -%>
wsrep_cluster_address="gcomm://<%= @node_addresses.collect {|ip| ip + ':' + 4567 }.join ',' %>"
<% else -%>
wsrep_cluster_address="gcomm://"
<% 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=

4
deployment/puppet/mysql/manifests/server.pp
View File

@ -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)
}

1
deployment/puppet/openstack/examples/site.pp
View File

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

1
deployment/puppet/openstack/examples/site_openstack_swift_compact.pp
View File

@ -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':

1
deployment/puppet/openstack/examples/site_openstack_swift_standalone.pp
View File

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

2
deployment/puppet/openstack/manifests/controller.pp
View File

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

3
deployment/puppet/openstack/manifests/controller_ha.pp
View File

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