openstack/placement
Code Issues Proposed changes

Merge "Config options: Centralize neutron options"

Browse Source
This commit is contained in:
Jenkins 2016-04-06 14:30:22 +00:00 committed by Gerrit Code Review
commit d69be8fbc1
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

@ -57,7 +57,7 @@ from nova.conf import mks
# from nova.conf import metadata
# from nova.conf import metrics
from nova.conf import network
# from nova.conf import neutron
from nova.conf import neutron
# from nova.conf import notification
# from nova.conf import osapi_v21
from nova.conf import pci
@ -122,7 +122,7 @@ keymgr.register_opts(CONF)
# metadata.register_opts(CONF)
# metrics.register_opts(CONF)
network.register_opts(CONF)
# neutron.register_opts(CONF)
neutron.register_opts(CONF)
# notification.register_opts(CONF)
# osapi_v21.register_opts(CONF)
pci.register_opts(CONF)