summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-16 13:29:46 +0000
committerGerrit Code Review <review@openstack.org>2012-07-16 13:29:46 +0000
commit7b43a748dda0813a601aa3a81ecb04cee6505601 (patch)
tree93c0c83fa697dfb9e6ae4ae4570935eaf7970054 /openstack
parent01ded76da8dc119c46707fa6c4be116fda7b7af3 (diff)
parent8e5eac62b96ed684f2d90647bc197bbff86bad07 (diff)
downloadoslo-7b43a748dda0813a601aa3a81ecb04cee6505601.tar.gz
oslo-7b43a748dda0813a601aa3a81ecb04cee6505601.tar.xz
oslo-7b43a748dda0813a601aa3a81ecb04cee6505601.zip
Merge "Restore register_opts on impl_zmq module load"
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/rpc/impl_zmq.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py
index fff1dd0..b8cc959 100644
--- a/openstack/common/rpc/impl_zmq.py
+++ b/openstack/common/rpc/impl_zmq.py
@@ -719,3 +719,6 @@ def register_opts(conf):
mm_impl = importutils.import_module(mm_module)
mm_constructor = getattr(mm_impl, mm_class)
matchmaker = mm_constructor()
+
+
+register_opts(cfg.CONF)