diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-06 01:41:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-06 01:41:40 +0000 |
| commit | 2b11f29824719f961d35c66617f3ee654cf9f0f3 (patch) | |
| tree | a6b9933cf9a0e8fd7b206fa46f13be226be7c4de /manifests | |
| parent | a75c6c618e34d74389b9963f994f5e18ec29674a (diff) | |
| parent | a0983a4ed743e9d0ca152c29303cce73a1ca5113 (diff) | |
Merge "Revert "Revert "set innodb_file_per_table to ON for MySQL / Galera"""
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/database/mysql.pp | 15 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/database/mysql.pp | 1 |
2 files changed, 9 insertions, 7 deletions
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, |