diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-09-05 15:34:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-09-05 15:34:24 +0000 |
| commit | 1a8c62acb9414bbd8efd1ac0de084f63633e99cd (patch) | |
| tree | f8cc91555c8fa7be257204e3fef8c231b9d1a8f7 | |
| parent | 7ad7080a822ade173ea37f2069a997f5802ee86d (diff) | |
| parent | 8ee9e9ce143377a82e13f45a02a2c8aa06225d57 (diff) | |
| download | trove-2013.2.b3.tar.gz | |
Merge "Adds includedir back to templates"2013.2.b3
| -rw-r--r-- | trove/guestagent/manager/mysql_service.py | 7 | ||||
| -rw-r--r-- | trove/templates/mysql.config.template | 1 | ||||
| -rw-r--r-- | trove/templates/percona.config.template | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/trove/guestagent/manager/mysql_service.py b/trove/guestagent/manager/mysql_service.py index 7077ff44..82e8f371 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 7d4d472e..90b5b490 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 7d4d472e..90b5b490 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/ |