diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-27 19:11:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-27 19:11:20 +0100 |
| commit | 8c701618a42fc6c08456e53154bac1a1d40f9534 (patch) | |
| tree | c6683dbbd27d9d85aa9d9b139ca0e2bd175ef54d /scripts/IceGridAdmin.py | |
| parent | ICE-5781: UDP test failure with IPv6 on OS X (diff) | |
| download | ice-8c701618a42fc6c08456e53154bac1a1d40f9534.tar.bz2 ice-8c701618a42fc6c08456e53154bac1a1d40f9534.tar.xz ice-8c701618a42fc6c08456e53154bac1a1d40f9534.zip | |
Fixed IceDiscovery and IceGridDiscovery to check for Ice.PreferIPv6Address to configure UDP
Diffstat (limited to 'scripts/IceGridAdmin.py')
| -rw-r--r-- | scripts/IceGridAdmin.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index a7b645de47f..e5b998a43bb 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -60,6 +60,9 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.DefaultTemplates="' + \ os.path.abspath(os.path.join(TestUtil.toplevel, "cpp", "config", "templates.xml") + '"') +if TestUtil.ipv6: + registryOptions += r' --IceGrid.Registry.Discovery.Interface="::1"' + def getDefaultLocatorProperty(): i = 0 |