From 13859ffee8d85e4c3965c6fe5005d44baf5a4de1 Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <vincent@nexedi.com>
Date: Wed, 8 Feb 2012 15:53:19 +0100
Subject: [PATCH] Inline mysql_conf now that there is a single user of this
variable.
---
slapos/recipe/generic_mysql/__init__.py | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/slapos/recipe/generic_mysql/__init__.py b/slapos/recipe/generic_mysql/__init__.py
index 036687c5..fa333b9b 100644
--- a/slapos/recipe/generic_mysql/__init__.py
+++ b/slapos/recipe/generic_mysql/__init__.py
@@ -41,22 +41,21 @@ class Recipe(GenericBaseRecipe):
template_filename = self.getTemplateFilename('my.cnf.in')
- mysql_conf = dict(
- ip=self.options['ip'],
- data_directory=self.options['data-directory'],
- tcp_port=self.options['port'],
- pid_file=self.options['pid-file'],
- socket=self.options['socket'],
- error_log=self.options['error-log'],
- slow_query_log=self.options['slow-query-log'],
- )
-
mysql_binary = self.options['mysql-binary']
socket = self.options['socket']
mysql_conf_file = self.createFile(
self.options['conf-file'],
- self.substituteTemplate(template_filename, mysql_conf)
+ self.substituteTemplate(template_filename, {
+ # TODO: drop ip & port
+ 'ip': self.options['ip'],
+ 'tcp_port': self.options['port'],
+ 'data_directory': self.options['data-directory'],
+ 'pid_file': self.options['pid-file'],
+ 'socket': self.options['socket'],
+ 'error_log': self.options['error-log'],
+ 'slow_query_log': self.options['slow-query-log'],
+ })
)
path_list.append(mysql_conf_file)
--
2.30.9