openstack/placement
Code Issues Proposed changes

Merge "Move config options from nova/network/manager.py"

Browse Source
This commit is contained in:
Jenkins 2016-03-25 16:49:35 +00:00 committed by Gerrit Code Review
commit c467641455
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/conf/__init__.py
View File

@ -54,7 +54,7 @@ from nova.conf import ironic
# from nova.conf import matchmaker_redis # from nova.conf import matchmaker_redis
# from nova.conf import metadata # from nova.conf import metadata
# from nova.conf import metrics # from nova.conf import metrics
# from nova.conf import network from nova.conf import network
# from nova.conf import neutron # from nova.conf import neutron
# from nova.conf import notification # from nova.conf import notification
# from nova.conf import osapi_v21 # from nova.conf import osapi_v21
@ -114,7 +114,7 @@ ironic.register_opts(CONF)
# matchmaker_redis.register_opts(CONF) # matchmaker_redis.register_opts(CONF)
# metadata.register_opts(CONF) # metadata.register_opts(CONF)
# metrics.register_opts(CONF) # metrics.register_opts(CONF)
# network.register_opts(CONF) network.register_opts(CONF)
# neutron.register_opts(CONF) # neutron.register_opts(CONF)
# notification.register_opts(CONF) # notification.register_opts(CONF)
# osapi_v21.register_opts(CONF) # osapi_v21.register_opts(CONF)