openstack/fuel-library
Code Issues Proposed changes

mysql skip-name-resolve option

Browse Source
This commit is contained in:
Dmitry Pyzhov 2013-01-28 12:00:27 +04:00 committed by Gerrit Code Review
parent f5cab8f04e
commit 05981387eb
6 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ class galera (
$primary_controller = false,
$node_address = $ipaddress_eth0,
$setup_multiple_gcomm = true,
$skip_name_resolve = false,
$node_addresses = [
$ipaddress_eth0]) {
include galera::params

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

@ -132,3 +132,6 @@ wsrep_sst_auth=<%= mysql_user %>:<%= mysql_password %>
# Protocol version to use
# wsrep_protocol_version=
<% if skip_name_resolve -%>
skip-name-resolve
<% end -%>

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

@ -25,7 +25,8 @@ class mysql::server (
$galera_cluster_name = undef,
$primary_controller = primary_controller,
$galera_node_address = undef,
$galera_nodes = undef
$galera_nodes = undef,
$mysql_skip_name_resolve = false,
) inherits mysql::params {
if ($custom_setup_class == undef) {
@ -64,6 +65,7 @@ class mysql::server (
primary_controller => $primary_controller,
node_address => $galera_node_address,
node_addresses => $galera_nodes,
skip_name_resolve => $mysql_skip_name_resolve,
}
# require($galera_class)
}

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

@ -158,6 +158,7 @@ class openstack::controller (
$galera_node_address = '127.0.0.1',
$glance_backend = 'file',
$galera_nodes = ['127.0.0.1'],
$mysql_skip_name_resolve = false,
$manage_volumes = false,
$nv_physical_volume = undef,
$use_syslog = false,
@ -214,6 +215,7 @@ class openstack::controller (
galera_node_address => $galera_node_address ,
galera_nodes => $galera_nodes,
custom_setup_class => $custom_mysql_setup_class,
mysql_skip_name_resolve => $mysql_skip_name_resolve,
}
}
####### KEYSTONE ###########

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

@ -126,6 +126,7 @@ class openstack::controller_ha (
$quantum_netnode_on_cnt = false,
$quantum_gre_bind_addr = $internal_address,
$quantum_external_ipinfo = {},
$mysql_skip_name_resolve = false,
) {
# haproxy
@ -291,6 +292,7 @@ local0.* -/var/log/haproxy.log'
primary_controller => $primary_controller,
galera_node_address => $internal_address,
galera_nodes => $galera_nodes,
mysql_skip_name_resolve => $mysql_skip_name_resolve,
admin_email => $admin_email,
admin_user => $admin_user,
admin_password => $admin_password,

2
deployment/puppet/openstack/manifests/db/mysql.pp
View File

@ -65,6 +65,7 @@ class openstack::db::mysql (
$primary_controller = false,
$galera_node_address = '127.0.0.1',
$galera_nodes = ['127.0.0.1'],
$mysql_skip_name_resolve = false,
$custom_setup_class = undef
) {
@ -89,6 +90,7 @@ class openstack::db::mysql (
galera_nodes => $galera_nodes,
enabled => $enabled,
custom_setup_class => $custom_setup_class,
mysql_skip_name_resolve => $mysql_skip_name_resolve,
}