summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-15 08:59:35 +0000
committerGerrit Code Review <review@openstack.org>2015-05-15 08:59:36 +0000
commit12c2fe3cb4372cc94279561ebba1bba0f2d32b6a (patch)
tree7c24a98852d7ddcfa2d87a68ce780233ad1c2c0b /puppet
parentcbd56fa47fd9fbd8a596acae56028a2bf128fb45 (diff)
parentf7c60ee6535461186dffde847afa340e9aa27c8e (diff)
Merge "Makes sure galera can handle the connections"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_controller.pp6
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp2
2 files changed, 6 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 1b088a86..2b4e2052 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -90,8 +90,10 @@ if hiera('step') >= 2 {
config_file => $mysql_config_file,
override_options => {
'mysqld' => {
- 'bind-address' => hiera('controller_host')
- }
+ 'bind-address' => hiera('controller_host'),
+ 'max_connections' => '1024',
+ 'open_files_limit' => '-1',
+ },
}
}
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index c7df2567..930e9030 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -156,6 +156,8 @@ if hiera('step') >= 2 {
'query_cache_size' => '0',
'query_cache_type' => '0',
'bind-address' => hiera('controller_host'),
+ 'max_connections' => '1024',
+ 'open_files_limit' => '-1',
'wsrep_provider' => '/usr/lib64/galera/libgalera_smm.so',
'wsrep_cluster_name' => 'galera_cluster',
'wsrep_slave_threads' => '1',