diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-07-11 11:06:03 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-07-14 08:59:40 -0400 |
| commit | 6a629a4dccf08597d79776de2e0814c46fe84afb (patch) | |
| tree | 38a611c4b093adae7ab85611ceb50f7f0abea373 /puppet/manifests/overcloud_controller.pp | |
| parent | 167d93eaa324cf176346b783db3380ff6f0cbf98 (diff) | |
Move MySQL Galera within composable services
This patch just moves the Puppet code into puppet-tripleo.
A future iteration will be to move parameters within the service
template.
Closes-Bug: #1601853
Depends-On: I7ddae28a6affd55c5bffc15d72226a18c708850e
Change-Id: I51a05dbf53f516b200c146b35529ce563ce9ac7b
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index bc9a42a4..a4151d03 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -19,28 +19,6 @@ include ::tripleo::firewall $enable_load_balancer = hiera('enable_load_balancer', true) if hiera('step') >= 2 { - 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 - # FIXME: due to https://bugzilla.redhat.com/show_bug.cgi?id=1298671 we - # set bind-address to a hostname instead of an ip address; to move Mysql - # from internal_api on another network we'll have to customize both - # MysqlNetwork and ControllerHostnameResolveNetwork in ServiceNetMap - class { '::mysql::server': - config_file => $mysql_config_file, - override_options => { - 'mysqld' => { - 'bind-address' => $::hostname, - 'max_connections' => hiera('mysql_max_connections'), - 'open_files_limit' => '-1', - }, - }, - remove_default_accounts => true, - } - # FIXME: this should only occur on the bootstrap host (ditto for db syncs) # Create all the database schemas include ::aodh::db::mysql |