diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-20 16:24:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-20 16:24:20 +0100 |
| commit | 45935826522a94c58c48531acbdd834f8735b1d7 (patch) | |
| tree | fabe7275210047b4b653ab32862510eb14519f41 /scripts/IceGridUtil.py | |
| parent | Fixed ICE-7580 - IceGrid/allocation failure (diff) | |
| download | ice-45935826522a94c58c48531acbdd834f8735b1d7.tar.bz2 ice-45935826522a94c58c48531acbdd834f8735b1d7.tar.xz ice-45935826522a94c58c48531acbdd834f8735b1d7.zip | |
Fix for ICE-7594 - Use IPv6 loopback for multicast to prevent discovery failures on some VMs
Diffstat (limited to 'scripts/IceGridUtil.py')
| -rw-r--r-- | scripts/IceGridUtil.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index 64d6aabbb58..7fd689e085c 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -132,6 +132,8 @@ class IceGridRegistry(ProcessFromBinDir, Server): shutil.rmtree(self.dbdir) def getProps(self, current): + # NOTE: we use the loopback interface for multicast with IPv6 to prevent failures + # on some machines which don't really have an IPv6 interface configured. props = { 'IceGrid.InstanceName' : 'TestIceGrid', 'IceGrid.Registry.PermissionsVerifier' : 'TestIceGrid/NullPermissionsVerifier', @@ -141,7 +143,7 @@ class IceGridRegistry(ProcessFromBinDir, Server): 'IceGrid.Registry.Server.Endpoints' : 'default', 'IceGrid.Registry.Internal.Endpoints' : 'default', 'IceGrid.Registry.Client.Endpoints' : self.getEndpoints(current), - 'IceGrid.Registry.Discovery.Interface' : '"::1"' if current.config.ipv6 and isinstance(platform, Darwin) else '', + 'IceGrid.Registry.Discovery.Interface' : '"::1"' if current.config.ipv6 else '', 'IceGrid.Registry.Discovery.Port' : current.driver.getTestPort(99), 'IceGrid.Registry.SessionManager.Endpoints' : 'default', 'IceGrid.Registry.AdminSessionManager.Endpoints' : 'default', |