From 81bf9c9685cf0b0b5419ff76c1c9816c33b67be6 Mon Sep 17 00:00:00 2001 From: Ildiko Vancsa Date: Sun, 9 Aug 2015 13:08:36 +0200 Subject: [PATCH] Move import to local to resolve circular dependency failure Move from aodh import opts imprt to local in service.py. Closes-Bug: #1482973 Change-Id: I3aabada420eaf82de92eb389542be2c823f883e0 --- aodh/service.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aodh/service.py b/aodh/service.py index 0399d5bd..21f3cdb9 100644 --- a/aodh/service.py +++ b/aodh/service.py @@ -26,7 +26,6 @@ from oslo_messaging import opts as msg_opts from oslo_policy import opts as policy_opts from aodh import messaging -from aodh import opts OPTS = [ @@ -120,6 +119,8 @@ def prepare_service(argv=None): for group, options in msg_opts.list_opts(): conf.register_opts(list(options), group=None if group == "DEFAULT" else group) + + from aodh import opts # Register our own Aodh options for group, options in opts.list_opts(): conf.register_opts(list(options),