diff options
author | Jiri Stransky <jistr@redhat.com> | 2015-04-10 11:28:44 +0200 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2015-04-10 17:07:02 +0000 |
commit | bafe58c42d2c0c58346fce929cf443c0436b6cd5 (patch) | |
tree | 073e59b869a50c92a6752a11f92672fa16b9da55 /puppet/manifests/overcloud_controller.pp | |
parent | ea327280931da20c258cc30a64bd9c57cc0b8ddb (diff) |
MariaDB bind on correct address
Despite passing bind-address for MariaDB in overcloud_controller.pp
correctly, it was always trying to bind on 0.0.0.0. The problem is
caused by Galera's config file (we install Galera into the image even
though we don't use it yet). Galera's default config file contains
override of the bind-address value to 0.0.0.0, and the setting from
galera.cnf took precendence over what was in server.cnf.
The mariadb-galera-server package assumes that the main config happens
in galera.cnf and it ships an almost empty server.cnf. We now have an
EnableGalera param, when it's set to true the mysql module will manage
galera.cnf instead of server.cnf, overriding the default values from
galera.cnf and fixing the issue.
Change-Id: I7c2fd41d41dcf5eb4ee8b1dbd74d60cc2cabeed9
Closes-Bug: #1442256
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 2b637b37..3e3f2e70 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -39,8 +39,15 @@ if hiera('step') >= 2 { include ::ntp } + if str2bool(hiera('enable_galera', 'true')) { + $mysql_config_file = '/etc/my.cnf.d/galera.cnf' + } else { + $mysql_config_file = '/etc/my.cnf.d/server.cnf' + } + # TODO Galara class { 'mysql::server': + config_file => $mysql_config_file, override_options => { 'mysqld' => { 'bind-address' => hiera('controller_host') |