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

Author: Terry Howe

openstackclient/common/openstackkeyring.py

@@ -56,5 +56,5 @@ def decrypt(self, password_encrypted):
 
 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)