summaryrefslogtreecommitdiff
path: root/keystoneclient/shell.py
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2012-12-06 15:24:47 -0500
committerDan Prince <dprince@redhat.com>2012-12-07 14:02:49 -0500
commitd734821c99aade7cd4285a5fd51736c475707dcd (patch)
tree70529364c6c2dd3a74693ab3099fe932daed0438 /keystoneclient/shell.py
parent1bff1909df68df07f9d47d8905ca5a1539790bfa (diff)
downloadpython-keystoneclient-d734821c99aade7cd4285a5fd51736c475707dcd.tar.gz
Rename --no_cache to --os_cache.
Some changes to make keystoneclient more backwards compatible by disabling key caching by default. This patch renames the CLI option for when to use the auth token cache to --os-cache and sets it to False by default. It also changes the ENV variable to OS_CACHE (instead of OS_NO_CACHE). Change-Id: I6e549feec6ee7500e398a1eceb5bb44cd7d40347
Diffstat (limited to 'keystoneclient/shell.py')
-rw-r--r--keystoneclient/shell.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py
index 9d9ed38..92b30ee 100644
--- a/keystoneclient/shell.py
+++ b/keystoneclient/shell.py
@@ -180,13 +180,12 @@ class OpenStackIdentityShell(object):
'against any certificate authorities. This '
'option should be used with caution.')
- parser.add_argument('--no-cache',
- default=env('OS_NO_CACHE',
- default=False),
+ parser.add_argument('--os-cache',
+ default=env('OS_CACHE', default=False),
action='store_true',
- help='Don\'t use the auth token cache. '
- 'Default to env[OS_NO_CACHE]')
- parser.add_argument('--no_cache',
+ help='Use the auth token cache. '
+ 'Default to env[OS_CACHE]')
+ parser.add_argument('--os_cache',
help=argparse.SUPPRESS)
parser.add_argument('--force-new-token',
@@ -409,7 +408,7 @@ class OpenStackIdentityShell(object):
cert=args.os_cert,
insecure=args.insecure,
debug=args.debug,
- use_keyring=(not args.no_cache),
+ use_keyring=args.os_cache,
force_new_token=args.force_new_token,
stale_duration=args.stale_duration)