From 6f89c962ce3995b6253ba63356aad42093151920 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Mon, 21 Jul 2014 17:13:00 +0200 Subject: [PATCH] Add SUSE support in mysql datastore SUSE uses /etc/my.cnf instead of /etc/mysql/my.cnf. This patch changes MYSQL_CONFIG from string to a dictionary using the operative system name as key to identify where mysql's configuration is located. blueprint: suse-support Co-Authored-By: Ionut Artarisi Change-Id: Ibb17fa584ae3bc632e970f0a3dd99af2ac51b441 --- trove/guestagent/datastore/mysql/service.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trove/guestagent/datastore/mysql/service.py b/trove/guestagent/datastore/mysql/service.py index 8551b95629..a369b1340e 100644 --- a/trove/guestagent/datastore/mysql/service.py +++ b/trove/guestagent/datastore/mysql/service.py @@ -59,7 +59,10 @@ INCLUDE_MARKER_OPERATORS = { False: ">" } -MYSQL_CONFIG = "/etc/mysql/my.cnf" +OS_NAME = operating_system.get_os() +MYSQL_CONFIG = {operating_system.REDHAT: "/etc/mysql/my.cnf", + operating_system.DEBIAN: "/etc/mysql/my.cnf", + operating_system.SUSE: "/etc/my.cnf"}[OS_NAME] MYSQL_SERVICE_CANDIDATES = ["mysql", "mysqld", "mysql-server"] MYSQL_BIN_CANDIDATES = ["/usr/sbin/mysqld", "/usr/libexec/mysqld"] MYCNF_OVERRIDES = "/etc/mysql/conf.d/overrides.cnf"