diff options
| author | Terry Howe <thowe@hp.com> | 2014-01-23 09:33:06 -0700 |
|---|---|---|
| committer | Terry Howe <thowe@hp.com> | 2014-01-23 09:37:13 -0700 |
| commit | bc2395eb473a203d11df52d48968b6ab61e2c95e (patch) | |
| tree | 36c643f0fef30f045f27444658733608e459bf6f /openstackclient/common/openstackkeyring.py | |
| parent | 9e9bbad120e16d2c490b7c65de35e15cb233411a (diff) | |
| download | python-openstackclient-bc2395eb473a203d11df52d48968b6ab61e2c95e.tar.gz | |
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
Diffstat (limited to 'openstackclient/common/openstackkeyring.py')
| -rw-r--r-- | openstackclient/common/openstackkeyring.py | 4 |
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) |