From 8ee9e9ce143377a82e13f45a02a2c8aa06225d57 Mon Sep 17 00:00:00 2001 From: Paul Marshall Date: Fri, 30 Aug 2013 07:43:52 -0500 Subject: [PATCH] Adds includedir back to templates This adds includedir to the mysql templates, which allows overriding of default my.cnf settings. Additionally, /etc/mysql/conf.d is created if it doesn't already exist to prevent mysql from failing. Change-Id: I1e051978b2363eaa9fd11abf1b107bd1e9c0edcb Fixes: bug #1218613 --- trove/guestagent/manager/mysql_service.py | 7 +++++++ trove/templates/mysql.config.template | 1 + trove/templates/percona.config.template | 1 + 3 files changed, 9 insertions(+) diff --git a/trove/guestagent/manager/mysql_service.py b/trove/guestagent/manager/mysql_service.py index 7077ff4402..82e8f37158 100644 --- a/trove/guestagent/manager/mysql_service.py +++ b/trove/guestagent/manager/mysql_service.py @@ -679,11 +679,18 @@ class MySqlApp(object): def _install_mysql(self): """Install mysql server. The current version is 5.5""" LOG.debug(_("Installing mysql server")) + self._create_mysql_confd_dir() packager.pkg_install(self.MYSQL_PACKAGE_VERSION, self.TIME_OUT) self.start_mysql() LOG.debug(_("Finished installing mysql server")) #TODO(rnirmal): Add checks to make sure the package got installed + def _create_mysql_confd_dir(self): + conf_dir = "/etc/mysql/conf.d" + LOG.debug("Creating %s" % conf_dir) + command = "sudo mkdir -p %s" % conf_dir + utils.execute_with_timeout(command) + def _enable_mysql_on_boot(self): """ There is a difference between the init.d mechanism and the upstart diff --git a/trove/templates/mysql.config.template b/trove/templates/mysql.config.template index 7d4d472ec4..90b5b49004 100644 --- a/trove/templates/mysql.config.template +++ b/trove/templates/mysql.config.template @@ -51,3 +51,4 @@ max_allowed_packet = 16M [isamchk] key_buffer = 16M +!includedir /etc/mysql/conf.d/ diff --git a/trove/templates/percona.config.template b/trove/templates/percona.config.template index 7d4d472ec4..90b5b49004 100644 --- a/trove/templates/percona.config.template +++ b/trove/templates/percona.config.template @@ -51,3 +51,4 @@ max_allowed_packet = 16M [isamchk] key_buffer = 16M +!includedir /etc/mysql/conf.d/