Merge "Rename Openstack to OpenStack"

This commit is contained in:
Jenkins 2014-02-21 01:36:26 +00:00 committed by Gerrit Code Review
commit 2cae50c442

@ -13,7 +13,7 @@
# under the License. # under the License.
# #
"""Keyring backend for Openstack, to store encrypted password in a file.""" """Keyring backend for OpenStack, to store encrypted password in a file."""
from Crypto.Cipher import AES from Crypto.Cipher import AES
@ -24,8 +24,8 @@ import os
KEYRING_FILE = os.path.join(os.path.expanduser('~'), '.openstack-keyring.cfg') KEYRING_FILE = os.path.join(os.path.expanduser('~'), '.openstack-keyring.cfg')
class OpenstackKeyring(keyring.backends.file.BaseKeyring): class OpenStackKeyring(keyring.backends.file.BaseKeyring):
"""Openstack Keyring to store encrypted password.""" """OpenStack Keyring to store encrypted password."""
filename = KEYRING_FILE filename = KEYRING_FILE
def supported(self): def supported(self):
@ -56,5 +56,5 @@ class OpenstackKeyring(keyring.backends.file.BaseKeyring):
def os_keyring(): def os_keyring():
"""Initialize the openstack keyring.""" """Initialize the openstack keyring."""
ring = 'openstackclient.common.openstackkeyring.OpenstackKeyring' ring = 'openstackclient.common.openstackkeyring.OpenStackKeyring'
return keyring.core.load_keyring(None, ring) return keyring.core.load_keyring(None, ring)