remove useless EVENTLET_NO_GREENDNS

Since eventlet 0.17, ipv6 is support for dns and getaddrinfo.

Glance depends on 0.18.2, so the workaround is no more needed.

a6ce444265

Related-bug: #1655727
Change-Id: Ic2bdc9a780ee98df87a7cdd5413a9db42e5e7131

glance/cmd/__init__.py

@@ -13,41 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
-import sys
-
-import oslo_utils.strutils as strutils
-
 from glance import i18n
 
-try:
-    import dns  # NOQA
-except ImportError:
-    dnspython_installed = False
-else:
-    dnspython_installed = True
-
-
-def fix_greendns_ipv6():
-    if dnspython_installed:
-        # 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.
-        nogreendns = 'EVENTLET_NO_GREENDNS'
-        flag = os.environ.get(nogreendns, '')
-        if 'eventlet' in sys.modules and not strutils.bool_from_string(flag):
-            msg = i18n._("It appears that the eventlet module has been "
-                         "imported prior to setting %s='yes'. It is currently "
-                         "necessary to disable eventlet.greendns "
-                         "if using ipv6 since eventlet.greendns currently "
-                         "breaks with ipv6 addresses. Please ensure that "
-                         "eventlet is not imported prior to this being set.")
-            raise ImportError(msg % nogreendns)
-
-        os.environ[nogreendns] = 'yes'
-
-
 i18n.enable_lazy()
-fix_greendns_ipv6()

glance/tests/__init__.py

@@ -13,11 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import glance.cmd as glance_cmd
-
-
-glance_cmd.fix_greendns_ipv6()
-
 # See http://code.google.com/p/python-nose/issues/detail?id=373
 # The code below enables tests to work with i18n _() blocks
 import six.moves.builtins as __builtin__

glance/tests/unit/common/test_wsgi_ipv6.py

@@ -1,81 +0,0 @@
-# Copyright 2010-2014 OpenStack Foundation
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import subprocess
-
-from glance.tests import utils as test_utils
-
-
-script = """
-import os
-import sys
-# Spoof module installed
-sys.modules['%s'] = object
-%s
-os.environ['EVENTLET_NO_GREENDNS'] = '%s'
-if 'eventlet' %s in sys.modules:
-    sys.exit(2)
-try:
-    import glance.cmd
-except ImportError:
-    sys.exit(%d)
-else:
-    sys.exit(%d)
-"""
-
-eventlet_no_dns = script % ('fake', 'import eventlet', 'foo', 'not', 1, 0)
-
-no_eventlet_no_dns = script % ('fake', '', 'foo', '', 1, 0)
-
-no_eventlet_no_greendns = script % ('dns', '', 'yes', '', 1, 0)
-
-eventlet_no_greendns = script % ('dns', 'import eventlet', 'yes', 'not', 1, 0)
-
-no_eventlet_greendns = script % ('dns', '', 'no', '', 1, 0)
-
-eventlet_greendns = script % ('dns', 'import eventlet', 'no', 'not', 0, 1)
-
-
-class IPv6ServerTest(test_utils.BaseTestCase):
-
-    def test_no_evnetlet_no_dnspython(self):
-        """Test eventlet not imported and dnspython not installed"""
-        rc = subprocess.call(['python', '-c', no_eventlet_no_dns])
-        self.assertEqual(0, rc)
-
-    def test_evnetlet_no_dnspython(self):
-        """Test eventlet pre-imported but dnspython not installed"""
-        rc = subprocess.call(['python', '-c', eventlet_no_dns])
-        self.assertEqual(0, rc)
-
-    def test_no_eventlet_no_greendns(self):
-        """Test eventlet not imported with EVENTLET_NO_GREENDNS='yes'"""
-        rc = subprocess.call(['python', '-c', no_eventlet_no_greendns])
-        self.assertEqual(0, rc)
-
-    def test_eventlet_no_greendns(self):
-        """Test eventlet pre-imported with EVENTLET_NO_GREENDNS='yes'"""
-        rc = subprocess.call(['python', '-c', eventlet_no_greendns])
-        self.assertEqual(0, rc)
-
-    def test_no_eventlet_w_greendns(self):
-        """Test eventlet not imported with EVENTLET_NO_GREENDNS='no'"""
-        rc = subprocess.call(['python', '-c', no_eventlet_greendns])
-        self.assertEqual(0, rc)
-
-    def test_eventlet_w_greendns(self):
-        """Test eventlet pre-imported with EVENTLET_NO_GREENDNS='no'"""
-        rc = subprocess.call(['python', '-c', eventlet_greendns])
-        self.assertEqual(0, rc)