do not ignore --os-cache

Change-Id: Ib8808da00967163faa9ce05e580605f4e499891d
This commit is contained in:
Alan Pevec 2013-04-02 12:16:37 +02:00
parent 593adf229a
commit 49ab03e6a6
1 changed files with 3 additions and 3 deletions

View File

@ -149,7 +149,7 @@ class SecretsHelper(object):
@property
def management_url(self):
if not HAS_KEYRING:
if not HAS_KEYRING or not self.args.os_cache:
return None
management_url = None
try:
@ -166,7 +166,7 @@ class SecretsHelper(object):
# want to look into the keyring module, if it
# exists and see if anything was provided in that
# file that we can use.
if not HAS_KEYRING:
if not HAS_KEYRING or not self.args.os_cache:
return None
token = None
try:
@ -179,7 +179,7 @@ class SecretsHelper(object):
@property
def tenant_id(self):
if not HAS_KEYRING:
if not HAS_KEYRING or not self.args.os_cache:
return None
tenant_id = None
try: