From 5c71c257e001b16e03ab78be4518736d5256c3bd Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 7 Aug 2013 07:00:13 +0100 Subject: Allow non-use of cfg.CONF in securemessage If someone passes a ConfigOpts instance other than cfg.CONF, we need to register the group and options with it. Change-Id: I10908d5e29d8a871ae29a5d3fa3f415e487f23b8 --- openstack/common/rpc/securemessage.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/openstack/common/rpc/securemessage.py b/openstack/common/rpc/securemessage.py index 4ecab02..19efa33 100644 --- a/openstack/common/rpc/securemessage.py +++ b/openstack/common/rpc/securemessage.py @@ -45,10 +45,9 @@ secure_message_opts = [ cfg.StrOpt('kds_endpoint', help='KDS endpoint (ex: http://kds.example.com:35357/v3)'), ] -CONF = cfg.CONF -CONF.register_group(cfg.OptGroup('secure_messages', - title='Secure Messaging options')) -CONF.register_opts(secure_message_opts, group='secure_messages') +secure_message_group = cfg.OptGroup('secure_messages', + title='Secure Messaging options') + LOG = logging.getLogger(__name__) @@ -347,6 +346,9 @@ class SecureMessage(object): def __init__(self, topic, host, conf, key=None, key_store=None, encrypt=None, enctype='AES', hashtype='SHA256'): + conf.register_group(secure_message_group) + conf.register_opts(secure_message_opts, group='secure_messages') + self._name = '%s.%s' % (topic, host) self._key = key self._conf = conf.secure_messages -- cgit