From bc2395eb473a203d11df52d48968b6ab61e2c95e Mon Sep 17 00:00:00 2001
From: Terry Howe <thowe@hp.com>
Date: Thu, 23 Jan 2014 09:33:06 -0700
Subject: [PATCH] Fix keyring issue where there were name space problems
The import of keyring conflicted with a string named keyring
Change-Id: I7416ea1cf453a126dd03dba8bc2900cad35ed2da
Closes-bug: #1271987
---
openstackclient/common/openstackkeyring.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openstackclient/common/openstackkeyring.py b/openstackclient/common/openstackkeyring.py
index 34c994b743..e60ce71ca6 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)