openstack/trove
Code Issues Proposed changes

Merge "Adds includedir back to templates"

Browse Source
This commit is contained in:
Jenkins 2013-09-05 15:34:24 +00:00 committed by Gerrit Code Review
commit 1a8c62acb9
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
trove/guestagent/manager/mysql_service.py
View File

@ -679,11 +679,18 @@ class MySqlApp(object):
def _install_mysql(self): def _install_mysql(self):
"""Install mysql server. The current version is 5.5""" """Install mysql server. The current version is 5.5"""
LOG.debug(_("Installing mysql server")) LOG.debug(_("Installing mysql server"))
self._create_mysql_confd_dir()
packager.pkg_install(self.MYSQL_PACKAGE_VERSION, self.TIME_OUT) packager.pkg_install(self.MYSQL_PACKAGE_VERSION, self.TIME_OUT)
self.start_mysql() self.start_mysql()
LOG.debug(_("Finished installing mysql server")) LOG.debug(_("Finished installing mysql server"))
#TODO(rnirmal): Add checks to make sure the package got installed #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): def _enable_mysql_on_boot(self):
""" """
There is a difference between the init.d mechanism and the upstart There is a difference between the init.d mechanism and the upstart

1
trove/templates/mysql.config.template
View File

@ -51,3 +51,4 @@ max_allowed_packet = 16M
[isamchk] [isamchk]
key_buffer = 16M key_buffer = 16M
!includedir /etc/mysql/conf.d/

1
trove/templates/percona.config.template
View File

@ -51,3 +51,4 @@ max_allowed_packet = 16M
[isamchk] [isamchk]
key_buffer = 16M key_buffer = 16M
!includedir /etc/mysql/conf.d/