Commit 13859ffe authored by Vincent Pelletier's avatar Vincent Pelletier

Inline mysql_conf now that there is a single user of this variable.

parent c1eed248
...@@ -41,22 +41,21 @@ class Recipe(GenericBaseRecipe): ...@@ -41,22 +41,21 @@ class Recipe(GenericBaseRecipe):
template_filename = self.getTemplateFilename('my.cnf.in') 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'] mysql_binary = self.options['mysql-binary']
socket = self.options['socket'] socket = self.options['socket']
mysql_conf_file = self.createFile( mysql_conf_file = self.createFile(
self.options['conf-file'], 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) path_list.append(mysql_conf_file)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment