openstack/placement
Code Issues Proposed changes

Merge "config options: Centralise 'virt.ironic' options"

Browse Source
This commit is contained in:
Jenkins 2016-01-05 04:54:31 +00:00 committed by Gerrit Code Review
commit bfea51fb0d
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

@ -46,7 +46,7 @@ from nova.conf import ephemeral_storage
# from nova.conf import image
# from nova.conf import imagecache
# from nova.conf import image_file_url
# from nova.conf import ironic
from nova.conf import ironic
# from nova.conf import keymgr
# from nova.conf import keystone_authtoken
# from nova.conf import libvirt
@ -104,7 +104,7 @@ ephemeral_storage.register_opts(CONF)
# image.register_opts(CONF)
# imagecache.register_opts(CONF)
# image_file_url.register_opts(CONF)
# ironic.register_opts(CONF)
ironic.register_opts(CONF)
# keymgr.register_opts(CONF)
# keystone_authtoken.register_opts(CONF)
# libvirt.register_opts(CONF)