diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-08-07 07:00:13 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-08-07 07:18:31 +0100 |
| commit | 5c71c257e001b16e03ab78be4518736d5256c3bd (patch) | |
| tree | 67fd2baa26d3fdfed4cc6e86fa71767e33a70adf /openstack/common | |
| parent | 56f0cf134176a380cbc236b1cc8cff63728d5ad0 (diff) | |
| download | oslo-5c71c257e001b16e03ab78be4518736d5256c3bd.tar.gz oslo-5c71c257e001b16e03ab78be4518736d5256c3bd.tar.xz oslo-5c71c257e001b16e03ab78be4518736d5256c3bd.zip | |
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
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/rpc/securemessage.py | 10 |
1 files 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 |