From 684412ca4cc0abad2c2a800d8247d12992b994e5 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Mon, 22 Aug 2016 08:29:29 -0500 Subject: [PATCH] Work around a version clash issue with os-client-config Need to add the fixed_arguments arg to _validate_auth() so os-client-config 1.19.1 and 1.20.0 can call our version properly. Change-Id: I328e47ba2f8115e6b18bf1482fd4aa35056907a4 --- openstackclient/common/client_config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openstackclient/common/client_config.py b/openstackclient/common/client_config.py index cc6cad589..bbcb34eb7 100644 --- a/openstackclient/common/client_config.py +++ b/openstackclient/common/client_config.py @@ -148,11 +148,11 @@ class OSC_Config(OpenStackConfig): LOG.debug("auth_config_hook(): %s" % config) return config - def _validate_auth_ksc(self, config, cloud): + def _validate_auth_ksc(self, config, cloud, fixed_argparse=None): """Old compatibility hack for OSC, no longer needed/wanted""" return config - def _validate_auth(self, config, loader): + def _validate_auth(self, config, loader, fixed_argparse=None): """Validate auth plugin arguments""" # May throw a keystoneauth1.exceptions.NoMatchingPlugin