From d6dc64c43f40d143ec231ad485be5e77515d8e62 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 10 May 2013 07:47:13 -0400 Subject: Revert "Disable eventlet monkey-patching of DNS" This reverts commit 6219f94b3a1103a16bd5f16ed8ffdd41a85280e1. This commit seems to cause keystone auth to hang when using Keystone w/ Swift. Fixes LP Bug #1178646. Change-Id: Ieb94a29b3129847c84a02c8a526611f125f21ea0 --- keystone/__init__.py | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'keystone/__init__.py') diff --git a/keystone/__init__.py b/keystone/__init__.py index bfbd31a2..e69de29b 100644 --- a/keystone/__init__.py +++ b/keystone/__init__.py @@ -1,15 +0,0 @@ - -import os -import sys - -# NOTE(mikal): All of this is because if dnspython is present in your -# environment then eventlet monkeypatches socket.getaddrinfo() with an -# implementation which doesn't work for IPv6. What we're checking here is -# that the magic environment variable was set when the import happened. -if ('eventlet' in sys.modules and os.environ.get( - 'EVENTLET_NO_GREENDNS', '').lower() != 'yes'): - raise ImportError('eventlet imported before keystone ' - '(env var set to %s)' - % os.environ.get('EVENTLET_NO_GREENDNS')) - -os.environ['EVENTLET_NO_GREENDNS'] = 'yes' -- cgit