diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-08 19:34:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-08 19:34:29 +0000 |
| commit | 48d8a2e5a60f408dd42226fff9824bc4403c11d9 (patch) | |
| tree | c0bc10b0f85349f8012a0eef6d3017f2d67d7e49 | |
| parent | de822b4f737e1485de02e8d5accabed0738701ea (diff) | |
| parent | 09aa83101018fb85332c664aae70d276fe80a2b9 (diff) | |
| download | trove-48d8a2e5a60f408dd42226fff9824bc4403c11d9.tar.gz | |
Merge "Use existing CNF_INCLUDE_DIR to create mysql-flavor directory"
| -rw-r--r-- | trove/guestagent/datastore/mysql_common/service.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/trove/guestagent/datastore/mysql_common/service.py b/trove/guestagent/datastore/mysql_common/service.py index 28931b03..0f638bc4 100644 --- a/trove/guestagent/datastore/mysql_common/service.py +++ b/trove/guestagent/datastore/mysql_common/service.py @@ -75,7 +75,7 @@ MYSQL_CONFIG = {operating_system.REDHAT: "/etc/my.cnf", MYSQL_BIN_CANDIDATES = ["/usr/sbin/mysqld", "/usr/libexec/mysqld"] MYSQL_OWNER = 'mysql' CNF_EXT = 'cnf' -CNF_INCLUDE_DIR = '/etc/mysql/conf.d/' +CNF_INCLUDE_DIR = '/etc/mysql/conf.d' CNF_MASTER = 'master-replication' CNF_SLAVE = 'slave-replication' @@ -764,9 +764,8 @@ class BaseMySqlApp(object): pass def _create_mysql_confd_dir(self): - conf_dir = "/etc/mysql/conf.d" - LOG.debug("Creating %s.", conf_dir) - operating_system.create_directory(conf_dir, as_root=True) + LOG.debug("Creating %s.", CNF_INCLUDE_DIR) + operating_system.create_directory(CNF_INCLUDE_DIR, as_root=True) def _enable_mysql_on_boot(self): LOG.debug("Enabling MySQL on boot.") |