aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manifests/profile/base/database/mysql.pp15
-rw-r--r--manifests/profile/pacemaker/database/mysql.pp1
-rw-r--r--releasenotes/notes/innodb_file_per_table-f925b3bbf29d44ea.yaml20
3 files changed, 7 insertions, 29 deletions
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index d3c3f21..4ccfabc 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -119,14 +119,13 @@ 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',
- 'innodb_file_per_table' => 'ON',
- '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',
+ '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 ca9a1a8..6a83f10 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -75,7 +75,6 @@ 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,
diff --git a/releasenotes/notes/innodb_file_per_table-f925b3bbf29d44ea.yaml b/releasenotes/notes/innodb_file_per_table-f925b3bbf29d44ea.yaml
deleted file mode 100644
index e0b7c3c..0000000
--- a/releasenotes/notes/innodb_file_per_table-f925b3bbf29d44ea.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-features:
- - Enable innodb_file_per_table for MySQL/MariaDB databases
-upgrade:
- - |
- Newly created MySQL database tables will be stored in their own datafiles,
- instead of in a single monolithic ibdata file.
- - |
- Existing MySQL database tables that are persisted within the monolithic
- ibdata file will remain so unless the database is migrated as well.
- - |
- Migration of all current database tables out of the monolithic ibdata
- file is possible by dumping and restoring the whole database to a new data
- directory, however when using Galera the entire cluster must be shut
- down and upgraded at once.
- - |
- Migration of individual tables to datafiles is possible using the
- MySQL command "ALTER TABLE <databasename>.<tablename> ENGINE=InnoDB;",
- however this will not shrink the ibdata file and also is not safe to run
- on a running Galera cluster for large tables.