From fec46f51708f702e28b42576657002a3344b429a Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 25 Apr 2013 18:55:47 +0000 Subject: [PATCH] Puppet dashboard mysqld innodb_file_per_table. In 232747f we attempted to implement it this way initially, but subsequent patchsets went off into the weeds instead trying to use mysql::server::config which, as it turns out, was not introduced until a newer version of the puppetlabs mysql module than we use. Rather than go through a potentially disruptive infrastructure-wide upgrade right this moment, this patch gets the job done in a more traditional fashion. Change-Id: I6967388072c7c8b3e170048e23618ea95bccfecc Reviewed-on: https://review.openstack.org/27511 Reviewed-by: James E. Blair Reviewed-by: Anita Kuno Reviewed-by: Khai Do Reviewed-by: Paul Belanger Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- .../files/dashboard/mysqld_innodb_fpt.cnf | 2 ++ modules/openstack_project/manifests/dashboard.pp | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 modules/openstack_project/files/dashboard/mysqld_innodb_fpt.cnf diff --git a/modules/openstack_project/files/dashboard/mysqld_innodb_fpt.cnf b/modules/openstack_project/files/dashboard/mysqld_innodb_fpt.cnf new file mode 100644 index 0000000000..afb12bde12 --- /dev/null +++ b/modules/openstack_project/files/dashboard/mysqld_innodb_fpt.cnf @@ -0,0 +1,2 @@ +[mysqld] +innodb_file_per_table diff --git a/modules/openstack_project/manifests/dashboard.pp b/modules/openstack_project/manifests/dashboard.pp index 71881d51e0..144aff56c8 100644 --- a/modules/openstack_project/manifests/dashboard.pp +++ b/modules/openstack_project/manifests/dashboard.pp @@ -23,8 +23,12 @@ class openstack_project::dashboard( passenger => true, } - mysql::server::config { '50_innodb_file_per_table': - settings => '[mysqld]\ninnodb_file_per_table\n', + file { '/etc/mysql/conf.d/mysqld_innodb_fpt.cnf': + ensure => present, + source => + 'puppet://modules/openstack_project/dashboard/mysqld_innodb_fpt.cnf', + require => Class['mysql::server'], + notify => Service['mysql'], } }