Merge "Remove nova.config.CONF"

This commit is contained in:
Jenkins
2012-11-20 02:02:50 +00:00
committed by Gerrit Code Review
251 changed files with 323 additions and 343 deletions

View File

@@ -19,7 +19,6 @@
the system.
"""
from nova import config
import nova.context
from nova import db
from nova import exception
@@ -50,7 +49,7 @@ notify_api_faults = cfg.BoolOpt('notify_api_faults', default=False,
'in the API service.')
CONF = config.CONF
CONF = cfg.CONF
CONF.register_opt(notify_state_opt)
CONF.register_opt(notify_any_opt)
CONF.register_opt(notify_api_faults)