summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-01-23 17:38:15 +0000
committerGerrit Code Review <review@openstack.org>2014-01-23 17:38:15 +0000
commit0076f694acd7bc02ce1fb26ec0f1974ba68e0cf3 (patch)
tree14dd43b060fbf5a91148e65f1a3633e516713037 /openstackclient/common
parentcb2fd0af8301648e88f30c8cb449333be5ba1cb0 (diff)
parentbc2395eb473a203d11df52d48968b6ab61e2c95e (diff)
downloadpython-openstackclient-0076f694acd7bc02ce1fb26ec0f1974ba68e0cf3.tar.gz
Merge "Fix keyring issue where there were name space problems"
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/openstackkeyring.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/common/openstackkeyring.py b/openstackclient/common/openstackkeyring.py
index 34c994b7..e60ce71c 100644
--- a/openstackclient/common/openstackkeyring.py
+++ b/openstackclient/common/openstackkeyring.py
@@ -56,5 +56,5 @@ class OpenstackKeyring(keyring.backends.file.BaseKeyring):
def os_keyring():
"""Initialize the openstack keyring."""
- keyring = 'openstackclient.common.openstackkeyring.OpenstackKeyring'
- return keyring.core.load_keyring(None, keyring)
+ ring = 'openstackclient.common.openstackkeyring.OpenstackKeyring'
+ return keyring.core.load_keyring(None, ring)