openstack/python-heatclient
Code Issues Proposed changes

Merge "Heat client does not support OS_CACERT option"

Browse Source
This commit is contained in:
Jenkins
2014-04-29 05:16:50 +00:00
committed by Gerrit Code Review
parent 27b1ab9260 d32cdc0edc
commit aa360404ca
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
heatclient/shell.py
View File

@@ -72,6 +72,13 @@ class HeatShell(object):
"certificate authorities. " "certificate authorities. "
"This option should be used with caution.") "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', parser.add_argument('--cert-file',
help='Path of certificate file to use in SSL ' help='Path of certificate file to use in SSL '
'connection. This file can optionally be ' 'connection. This file can optionally be '
@@ -245,7 +252,8 @@ class HeatShell(object):
:param token: token to use instead of username/password :param token: token to use instead of username/password
""" """
kc_args = {'auth_url': kwargs.get('auth_url'), 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'): if kwargs.get('tenant_id'):
kc_args['tenant_id'] = 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, 'service_type': args.os_service_type,
'endpoint_type': args.os_endpoint_type, 'endpoint_type': args.os_endpoint_type,
'insecure': args.insecure, 'insecure': args.insecure,
'cacert': args.os_cacert,
'include_pass': args.include_password 'include_pass': args.include_password
} }

2
heatclient/tests/fakes.py
View File

@@ -21,11 +21,13 @@ def script_keystone_client(token=None):
if token: if token:
ksclient.Client(auth_url='http://no.where', ksclient.Client(auth_url='http://no.where',
insecure=False, insecure=False,
cacert=None,
tenant_id='tenant_id', tenant_id='tenant_id',
token=token).AndReturn(FakeKeystone(token)) token=token).AndReturn(FakeKeystone(token))
else: else:
ksclient.Client(auth_url='http://no.where', ksclient.Client(auth_url='http://no.where',
insecure=False, insecure=False,
cacert=None,
password='password', password='password',
tenant_name='tenant_name', tenant_name='tenant_name',
username='username').AndReturn(FakeKeystone( username='username').AndReturn(FakeKeystone(