Enable IPv6 support in KumoFS.

Based on work by Romain Courteaud <romain@nexedi.com>.

component/kumo/buildout.cfg

@@ -34,5 +34,5 @@ configure-options =
   --with-msgpack=${messagepack:location}
 
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
+  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -DKUMO_IPV6
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib

slapos/recipe/generic_kumofs/__init__.py

@@ -30,6 +30,11 @@ from slapos.recipe.librecipe import GenericBaseRecipe
 class Recipe(GenericBaseRecipe):
   def install(self):
     ip = self.options['ip']
+    address_family = self.options.get('address-family', 'inet4')
+    if address_family == 'inet6':
+      ip = '[' + ip + ']'
+    elif address_family != 'inet4':
+      raise ValueError('Unsupported address family: %r' % (address_family, ))
     kumo_manager_port = int(self.options['manager-port'])
     kumo_server_port = int(self.options['server-port'])
     kumo_server_listen_port = int(self.options['server-listen-port'])