summaryrefslogtreecommitdiff
path: root/nova/notifications.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-20 02:02:50 +0000
committerGerrit Code Review <review@openstack.org>2012-11-20 02:02:50 +0000
commit8c821c872cbec95bd48e68dc62c46030a097ce4f (patch)
treefe38ad882ef665d78f85dce46dda716a89971f08 /nova/notifications.py
parent1251c02d1d3587e7762eaab1352d08cbf5baa3c4 (diff)
parent94d87bce212f91c54370784a5544f1a07625938a (diff)
downloadnova-8c821c872cbec95bd48e68dc62c46030a097ce4f.tar.gz
Merge "Remove nova.config.CONF"
Diffstat (limited to 'nova/notifications.py')
-rw-r--r--nova/notifications.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/notifications.py b/nova/notifications.py
index ccfefe15f0..b1338c5823 100644
--- a/nova/notifications.py
+++ b/nova/notifications.py
@@ -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)