x/vmware-nsx
Code Issues Proposed changes

Merge "Ensure that the neutron server is properly monkey patched"

Browse Source
This commit is contained in:
Jenkins 2013-07-09 21:03:07 +00:00 committed by Gerrit Code Review
commit 1566cfd697
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/server/__init__.py
View File

@ -19,6 +19,7 @@
# If ../neutron/__init__.py exists, add ../ to Python search path, so that # If ../neutron/__init__.py exists, add ../ to Python search path, so that
# it will override what happens to be installed in /usr/(local/)lib/python... # it will override what happens to be installed in /usr/(local/)lib/python...
import eventlet
import sys import sys
from oslo.config import cfg from oslo.config import cfg
@ -28,6 +29,8 @@ from neutron import service
def main(): def main():
eventlet.monkey_patch()
# the configuration will be read into the cfg.CONF global data structure # the configuration will be read into the cfg.CONF global data structure
config.parse(sys.argv[1:]) config.parse(sys.argv[1:])
if not cfg.CONF.config_file: if not cfg.CONF.config_file: