From a035f95fef3944b3bf4d9ac5203726c72edb70c7 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 7 Aug 2013 07:05:21 +0100 Subject: Don't shadow cfg import in securemessage Change-Id: I03ed9f1cbbc08dea43a5c93d6997eb4e633dfed4 --- openstack/common/rpc/securemessage.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'openstack') diff --git a/openstack/common/rpc/securemessage.py b/openstack/common/rpc/securemessage.py index 4ecab02..f0658bf 100644 --- a/openstack/common/rpc/securemessage.py +++ b/openstack/common/rpc/securemessage.py @@ -356,7 +356,7 @@ class SecureMessage(object): self._kds = _KDSClient(self._conf.kds_endpoint) if self._key is None: - self._key = self._init_key(self._conf, topic, self._name) + self._key = self._init_key(topic, self._name) if self._key is None: err = "Secret Key (or key file) is missing or malformed" raise SharedKeyNotFound(self._name, err) @@ -364,13 +364,13 @@ class SecureMessage(object): global _KEY_STORE self._key_store = key_store or _KEY_STORE - def _init_key(self, cfg, topic, name): + def _init_key(self, topic, name): keys = None - if cfg.secret_keys_file: - with open(cfg.secret_keys_file, 'r') as f: + if self._conf.secret_keys_file: + with open(self._conf.secret_keys_file, 'r') as f: keys = f.readlines() - elif cfg.secret_key: - keys = cfg.secret_key + elif self._conf.secret_key: + keys = self._conf.secret_key if keys is None: return None -- cgit