From 82e45a6f5cb3e63d60d369d9fe06cb29e0a699e3 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Wed, 23 Jul 2014 15:48:27 -0700 Subject: [PATCH] Reorder the old compatibility arguments 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 --- keystoneclient/shell.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py index 30bd9a9f0..1305c89d8 100644 --- a/keystoneclient/shell.py +++ b/keystoneclient/shell.py @@ -176,10 +176,6 @@ class OpenStackIdentityShell(object): parser.add_argument('--os_cache', 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', default=False, action="store_true", @@ -203,6 +199,11 @@ class OpenStackIdentityShell(object): access.STALE_TOKEN_DURATION) 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 def get_subcommand_parser(self, version):