openstack/placement
Code Issues Proposed changes

Merge "Move config options from nova/cert directory"

Browse Source
This commit is contained in:
Jenkins 2016-01-27 12:49:38 +00:00 committed by Gerrit Code Review
commit 10a5b142c1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/conf/__init__.py
View File

@ -26,6 +26,7 @@ from oslo_config import cfg
# from nova.conf import barbican # from nova.conf import barbican
# from nova.conf import base # from nova.conf import base
# from nova.conf import cells # from nova.conf import cells
from nova.conf import cert
# from nova.conf import cinder # from nova.conf import cinder
# from nova.conf import cloudpipe # from nova.conf import cloudpipe
from nova.conf import compute from nova.conf import compute
@ -85,6 +86,7 @@ CONF = cfg.CONF
# barbican.register_opts(CONF) # barbican.register_opts(CONF)
# base.register_opts(CONF) # base.register_opts(CONF)
# cells.register_opts(CONF) # cells.register_opts(CONF)
cert.register_opts(CONF)
# cinder.register_opts(CONF) # cinder.register_opts(CONF)
# cloudpipe.register_opts(CONF) # cloudpipe.register_opts(CONF)
compute.register_opts(CONF) compute.register_opts(CONF)