diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-09 09:27:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-09 09:27:07 +0000 |
| commit | de0427f8f886f6be4c0777cfaccc336bef6aee7a (patch) | |
| tree | ec6c0b2579b708005f54977bd82a8fd108c7928e /openstack | |
| parent | 8719d26fd030b37dc4335e0e7e63e5b468073ebd (diff) | |
| parent | 5c71c257e001b16e03ab78be4518736d5256c3bd (diff) | |
| download | oslo-de0427f8f886f6be4c0777cfaccc336bef6aee7a.tar.gz oslo-de0427f8f886f6be4c0777cfaccc336bef6aee7a.tar.xz oslo-de0427f8f886f6be4c0777cfaccc336bef6aee7a.zip | |
Merge "Allow non-use of cfg.CONF in securemessage"
Diffstat (limited to 'openstack')
| -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 9dc2eca..c5530a6 100644 --- a/openstack/common/rpc/securemessage.py +++ b/openstack/common/rpc/securemessage.py @@ -47,10 +47,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__) @@ -349,6 +348,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 |