Make ip, port optional (disabling network usage).

slapos/recipe/generic_mysql/__init__.py

@@ -45,12 +45,18 @@ class Recipe(GenericBaseRecipe):
     mysql_binary = self.options['mysql-binary']
     socket = self.options['socket']
 
+    if 'ip' in self.options:
+      networking = 'port = %s\nbind-address = %s' % (
+        self.options['port'],
+        self.options['ip'],
+      )
+    else:
+      networking = 'skip-networking'
+
     mysql_conf_file = self.createFile(
       self.options['conf-file'],
       self.substituteTemplate(template_filename, {
-        # TODO: drop ip & port
-        'ip': self.options['ip'],
-        'tcp_port': self.options['port'],
+        'networking': networking,
         'data_directory': self.options['data-directory'],
         'pid_file': self.options['pid-file'],
         'socket': self.options['socket'],

slapos/recipe/generic_mysql/template/my.cnf.in

@@ -9,8 +9,7 @@
 sql-mode="NO_ENGINE_SUBSTITUTION"
 
 skip-show-database
-port = %(tcp_port)s
-bind-address = %(ip)s
+%(networking)s
 socket = %(socket)s
 datadir = %(data_directory)s
 pid-file = %(pid_file)s