summaryrefslogtreecommitdiff
path: root/nova/monkey_patch.py
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-09-07 02:21:04 +0000
committerGerrit Code Review <review@openstack.org>2022-09-07 02:21:04 +0000
commita9e81626c5e9dac897759c5f66c7ae1b4efa3c6d (patch)
treebad1148f1312188a081e1adcd3cb3de433d11770 /nova/monkey_patch.py
parent5633be211f4c2e656a585b4ff5ce94035a0df767 (diff)
parentedb8bcb0294fb1488c49ad76f2422378d0c495eb (diff)
downloadnova-23.2.2.tar.gz
Merge "reenable greendns in nova." into stable/wallabywallaby-em23.2.2
Diffstat (limited to 'nova/monkey_patch.py')
-rw-r--r--nova/monkey_patch.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/nova/monkey_patch.py b/nova/monkey_patch.py
index 3c96a433d5..6bcd9017a9 100644
--- a/nova/monkey_patch.py
+++ b/nova/monkey_patch.py
@@ -22,22 +22,11 @@ import os
def _monkey_patch():
- # See https://bugs.launchpad.net/nova/+bug/1164822
- # TODO(mdbooth): This feature was deprecated and removed in eventlet at
- # some point but brought back in version 0.21.0, presumably because some
- # users still required it to work round issues. However, there have been a
- # number of greendns fixes in eventlet since then. Specifically, it looks
- # as though the originally reported IPv6 issue may have been fixed in
- # version 0.24.0. We should remove this when we can confirm that the
- # original issue is fixed.
- # NOTE(artom) eventlet processes environment variables at import-time. We
- # therefore set this here, before importing eventlet, in order to correctly
- # disable greendns.
- os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
-
# NOTE(mdbooth): Anything imported here will not be monkey patched. It is
# important to take care not to import anything here which requires monkey
# patching.
+ # NOTE(artom) eventlet processes environment variables at import-time.
+ # as such any eventlet configuration should happen here if needed.
import eventlet
import sys