Provide KumoFS access over IPv6.

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

@@ -29,7 +29,7 @@ from slapos.recipe.librecipe import GenericBaseRecipe
 
 class Recipe(GenericBaseRecipe):
   def install(self):
-    ip = self.options['ip']
+    ip = "[%s]" % self.options['ip']
     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'])

stack/erp5/buildout.cfg

@@ -217,7 +217,7 @@ mode = 640
 [template-kumofs]
 < = template-jinja2-base
 filename = instance-kumofs.cfg
-md5sum = 7e13d689de7163dcab64e8df4711cdd7
+md5sum = b7fb712bcb1b809bb62a3c95a76fee86
 extra-context =
     key dash_location dash:location
     key dcron_location dcron:location

stack/erp5/instance-kumofs.cfg.in

@@ -17,13 +17,13 @@ offline = true
 
 [publish-kumofs-connection-information]
 recipe = slapos.cookbook:publishurl
-url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
+url = memcached://[${kumofs-instance:ip}]:${kumofs-instance:gateway-port}/
 
 [kumofs-instance]
 recipe = slapos.cookbook:generic.kumofs
 
 # Network options
-ip = ${slap-network-information:local-ipv4}
+ip = ${slap-network-information:global-ipv6}
 manager-port = 13101
 server-port = 13201
 server-listen-port = 13202