Put Session options into an option group
There are potentially a lot of options. Make sure Session options are in a group like Auth options are. Change-Id: I3e41f1ece0611a0cb7d9b8ab83cfa4bd0105b10d
This commit is contained in:
parent
205433aa57
commit
8761ab4323
@ -83,37 +83,46 @@ class Session(base.BaseLoader):
|
||||
**kwargs)
|
||||
|
||||
def register_argparse_arguments(self, parser):
|
||||
parser.add_argument('--insecure',
|
||||
default=False,
|
||||
action='store_true',
|
||||
help='Explicitly allow client to perform '
|
||||
'"insecure" TLS (https) requests. The '
|
||||
'server\'s certificate will not be verified '
|
||||
'against any certificate authorities. This '
|
||||
'option should be used with caution.')
|
||||
session_group = parser.add_argument_group(
|
||||
'API Connection Options',
|
||||
'Options controlling the HTTP API Connections')
|
||||
|
||||
parser.add_argument('--os-cacert',
|
||||
metavar='<ca-certificate>',
|
||||
default=os.environ.get('OS_CACERT'),
|
||||
help='Specify a CA bundle file to use in '
|
||||
'verifying a TLS (https) server certificate. '
|
||||
'Defaults to env[OS_CACERT].')
|
||||
session_group.add_argument(
|
||||
'--insecure',
|
||||
default=False,
|
||||
action='store_true',
|
||||
help='Explicitly allow client to perform '
|
||||
'"insecure" TLS (https) requests. The '
|
||||
'server\'s certificate will not be verified '
|
||||
'against any certificate authorities. This '
|
||||
'option should be used with caution.')
|
||||
|
||||
parser.add_argument('--os-cert',
|
||||
metavar='<certificate>',
|
||||
default=os.environ.get('OS_CERT'),
|
||||
help='Defaults to env[OS_CERT].')
|
||||
session_group.add_argument(
|
||||
'--os-cacert',
|
||||
metavar='<ca-certificate>',
|
||||
default=os.environ.get('OS_CACERT'),
|
||||
help='Specify a CA bundle file to use in '
|
||||
'verifying a TLS (https) server certificate. '
|
||||
'Defaults to env[OS_CACERT].')
|
||||
|
||||
parser.add_argument('--os-key',
|
||||
metavar='<key>',
|
||||
default=os.environ.get('OS_KEY'),
|
||||
help='Defaults to env[OS_KEY].')
|
||||
session_group.add_argument(
|
||||
'--os-cert',
|
||||
metavar='<certificate>',
|
||||
default=os.environ.get('OS_CERT'),
|
||||
help='Defaults to env[OS_CERT].')
|
||||
|
||||
parser.add_argument('--timeout',
|
||||
default=600,
|
||||
type=_positive_non_zero_float,
|
||||
metavar='<seconds>',
|
||||
help='Set request timeout (in seconds).')
|
||||
session_group.add_argument(
|
||||
'--os-key',
|
||||
metavar='<key>',
|
||||
default=os.environ.get('OS_KEY'),
|
||||
help='Defaults to env[OS_KEY].')
|
||||
|
||||
session_group.add_argument(
|
||||
'--timeout',
|
||||
default=600,
|
||||
type=_positive_non_zero_float,
|
||||
metavar='<seconds>',
|
||||
help='Set request timeout (in seconds).')
|
||||
|
||||
def load_from_argparse_arguments(self, namespace, **kwargs):
|
||||
kwargs.setdefault('insecure', namespace.insecure)
|
||||
|
Loading…
Reference in New Issue
Block a user