From ad415526f39f7f4b3189003fcfd2f72380a9089c Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Fri, 20 Feb 2015 14:48:46 -0600 Subject: [PATCH] Sync 'eventlet_backdoor' module from oslo-incubator The eventlet_backdor module hasn't been updated in Cinder since September of 2014. In order to be able to move to the oslo.log library and be able o clean other modules out of oslo-incubator we need to bring it up to the latest level. Current HEAD in OSLO: --------------------- commit e589dde0721a0a67e4030813e582afec6e70d042 Date: Wed Feb 18 03:08:12 2015 +0000 Merge "Have a little fun with release notes" Changes merged with this patch: --------------------- 2aacb111 - Change oslo.config to oslo_config 2fbf5065 - Remove oslo.log code and clean up versionutils API 80c47519 - Remove unnecessary import of eventlet a3220c51 - add list_opts to all modules with configuration options 5d40e143 - Remove code that moved to oslo.i18n Change-Id: I875964a00e449e2314a648cc9586d97e51990de8 --- cinder/openstack/common/eventlet_backdoor.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cinder/openstack/common/eventlet_backdoor.py b/cinder/openstack/common/eventlet_backdoor.py index ec9505f7d..1cdd52c56 100644 --- a/cinder/openstack/common/eventlet_backdoor.py +++ b/cinder/openstack/common/eventlet_backdoor.py @@ -16,21 +16,21 @@ from __future__ import print_function +import copy import errno import gc +import logging import os import pprint import socket import sys import traceback -import eventlet import eventlet.backdoor import greenlet from oslo.config import cfg -from cinder.openstack.common.gettextutils import _LI -from cinder.openstack.common import log as logging +from cinder.openstack.common._i18n import _LI help_for_backdoor_port = ( "Acceptable values are 0, , and :, where 0 results " @@ -49,6 +49,12 @@ CONF.register_opts(eventlet_backdoor_opts) LOG = logging.getLogger(__name__) +def list_opts(): + """Entry point for oslo.config-generator. + """ + return [(None, copy.deepcopy(eventlet_backdoor_opts))] + + class EventletBackdoorConfigValueError(Exception): def __init__(self, port_range, help_msg, ex): msg = ('Invalid backdoor_port configuration %(range)s: %(ex)s. ' -- 2.45.2