openstack/placement
Code Issues Proposed changes

Merge "config options: centralize 'spice' options"

Browse Source
This commit is contained in:
Jenkins 2016-04-20 05:25:19 +00:00 committed by Gerrit Code Review
commit 2b0323cd15
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

@ -72,7 +72,7 @@ from nova.conf import scheduler
# from nova.conf import security
from nova.conf import serial_console
from nova.conf import service
# from nova.conf import spice
from nova.conf import spice
# from nova.conf import ssl
# from nova.conf import trusted_computing
from nova.conf import upgrade_levels
@ -140,7 +140,7 @@ scheduler.register_opts(CONF)
# security.register_opts(CONF)
serial_console.register_opts(CONF)
service.register_opts(CONF)
# spice.register_opts(CONF)
spice.register_opts(CONF)
# ssl.register_opts(CONF)
# trusted_computing.register_opts(CONF)
upgrade_levels.register_opts(CONF)