From a0983a4ed743e9d0ca152c29303cce73a1ca5113 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 3 Feb 2017 18:18:42 +0000
Subject: Revert "Revert "set innodb_file_per_table to ON for MySQL / Galera""

This reverts commit 3f7e74ab24bb43f9ad7e24e0efd4206ac6a3dd4e.

After identifying how to workaround the performance issues on the
undercloud, let's put this back in. Enabling innodb_file_per_table is
important for operators to be able to better manage their databases.

Change-Id: I435de381a0f0e3ef221e498f442335cdce3fb818
Depends-On: I77507c638237072e38d9888aff3da884aeff0b59
Closes-Bug: #1660722
---
 manifests/profile/base/database/mysql.pp      | 15 ++++++++-------
 manifests/profile/pacemaker/database/mysql.pp |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'manifests')

diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 4ccfabc..d3c3f21 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -119,13 +119,14 @@ class tripleo::profile::base::database::mysql (
     # MysqlNetwork and ControllerHostnameResolveNetwork in ServiceNetMap
     $mysql_server_default = {
       'mysqld' => {
-        'bind-address'     => $bind_address,
-        'max_connections'  => hiera('mysql_max_connections'),
-        'open_files_limit' => '-1',
-        'ssl'              => $enable_internal_tls,
-        'ssl-key'          => $tls_keyfile,
-        'ssl-cert'         => $tls_certfile,
-        'ssl-ca'           => undef,
+        'bind-address'          => $bind_address,
+        'max_connections'       => hiera('mysql_max_connections'),
+        'open_files_limit'      => '-1',
+        'innodb_file_per_table' => 'ON',
+        'ssl'                   => $enable_internal_tls,
+        'ssl-key'               => $tls_keyfile,
+        'ssl-cert'              => $tls_certfile,
+        'ssl-ca'                => undef,
       }
     }
     $mysql_server_options_real = deep_merge($mysql_server_default, $mysql_server_options)
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 6a83f10..ca9a1a8 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -75,6 +75,7 @@ class tripleo::profile::pacemaker::database::mysql (
       'default-storage-engine'        => 'innodb',
       'innodb_autoinc_lock_mode'      => '2',
       'innodb_locks_unsafe_for_binlog'=> '1',
+      'innodb_file_per_table'         => 'ON',
       'query_cache_size'              => '0',
       'query_cache_type'              => '0',
       'bind-address'                  => $bind_address,
-- 
cgit 1.2.3-korg