diff options
author | Rob Crittenden <rcritten@redhat.com> | 2014-04-14 18:51:56 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2014-04-23 20:07:17 -0400 |
commit | d32cdc0edc65214e2789633fd1ec82f9d627e60d (patch) | |
tree | a807cb52baa8f0e8aec7724b393c4eb873b66985 /heatclient/shell.py | |
parent | f0fdb3eb338ebf1d73fd408f91cd69ac92cc642a (diff) | |
download | python-heatclient-d32cdc0edc65214e2789633fd1ec82f9d627e60d.tar.gz |
Heat client does not support OS_CACERT option
This option is standard in OpenStack clients to pass in the
location of any extra CA certificate bundle needed to
negotiate an SSL connection with SSL-secured services.
Change-Id: If675b36bf6bbd1df216277129b147c32555de0d0
Closes-Bug: 1308087
Diffstat (limited to 'heatclient/shell.py')
-rw-r--r-- | heatclient/shell.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/heatclient/shell.py b/heatclient/shell.py index badb72a..22173f5 100644 --- a/heatclient/shell.py +++ b/heatclient/shell.py @@ -72,6 +72,13 @@ class HeatShell(object): "certificate authorities. " "This option should be used with caution.") + parser.add_argument('--os-cacert', + metavar='<ca-certificate>', + default=utils.env('OS_CACERT', default=None), + help='Specify a CA bundle file to use in ' + 'verifying a TLS (https) server certificate. ' + 'Defaults to env[OS_CACERT]') + parser.add_argument('--cert-file', help='Path of certificate file to use in SSL ' 'connection. This file can optionally be ' @@ -245,7 +252,8 @@ class HeatShell(object): :param token: token to use instead of username/password """ kc_args = {'auth_url': kwargs.get('auth_url'), - 'insecure': kwargs.get('insecure')} + 'insecure': kwargs.get('insecure'), + 'cacert': kwargs.get('cacert')} if kwargs.get('tenant_id'): kc_args['tenant_id'] = kwargs.get('tenant_id') @@ -353,6 +361,7 @@ class HeatShell(object): 'service_type': args.os_service_type, 'endpoint_type': args.os_endpoint_type, 'insecure': args.insecure, + 'cacert': args.os_cacert, 'include_pass': args.include_password } |