openstack/python-keystoneclient
Code Issues Proposed changes

Reorder the old compatibility arguments

Browse Source 
The registration for --os-cert, os-cacert, and os-key were moved
recently into a new method. We need to register the new versions
(which have default values set) before the old compatible versions
(--os_cert, etc.) that have no default values set or the default
values which pull from the env variables (OS_CERT, etc.) get
ignored.

Change-Id: I4bfb89d02909176be420dd978f8235d94978c494
Closes-bug: 1347957
This commit is contained in:
Vishvananda Ishaya
2014-07-23 15:48:27 -07:00
parent 2ff18d3c89
commit 82e45a6f5c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
keystoneclient/shell.py
View File

@@ -176,10 +176,6 @@ class OpenStackIdentityShell(object):
parser.add_argument('--os_cache', parser.add_argument('--os_cache',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
parser.add_argument('--os_cacert', help=argparse.SUPPRESS)
parser.add_argument('--os_key', help=argparse.SUPPRESS)
parser.add_argument('--os_cert', help=argparse.SUPPRESS)
parser.add_argument('--force-new-token', parser.add_argument('--force-new-token',
default=False, default=False,
action="store_true", action="store_true",
@@ -203,6 +199,11 @@ class OpenStackIdentityShell(object):
access.STALE_TOKEN_DURATION) access.STALE_TOKEN_DURATION)
session.Session.register_cli_options(parser) session.Session.register_cli_options(parser)
parser.add_argument('--os_cacert', help=argparse.SUPPRESS)
parser.add_argument('--os_key', help=argparse.SUPPRESS)
parser.add_argument('--os_cert', help=argparse.SUPPRESS)
return parser return parser
def get_subcommand_parser(self, version): def get_subcommand_parser(self, version):