Commit ba47274b authored by Vincent Pelletier's avatar Vincent Pelletier

Revert "Enable IPv6 support in KumoFS."

This reverts commit e9b76a68.
When kumo is built with IPv6 support, it stops supporting IPv4, which
breaks existing SRs.
parent 2e2dfbd1
...@@ -34,5 +34,5 @@ configure-options = ...@@ -34,5 +34,5 @@ configure-options =
--with-msgpack=${messagepack:location} --with-msgpack=${messagepack:location}
environment = environment =
CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -DKUMO_IPV6 CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
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 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
...@@ -30,11 +30,6 @@ from slapos.recipe.librecipe import GenericBaseRecipe ...@@ -30,11 +30,6 @@ from slapos.recipe.librecipe import GenericBaseRecipe
class Recipe(GenericBaseRecipe): class Recipe(GenericBaseRecipe):
def install(self): def install(self):
ip = self.options['ip'] 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_manager_port = int(self.options['manager-port'])
kumo_server_port = int(self.options['server-port']) kumo_server_port = int(self.options['server-port'])
kumo_server_listen_port = int(self.options['server-listen-port']) kumo_server_listen_port = int(self.options['server-listen-port'])
......
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