And:
--- shell.py.orig 2015-08-21 14:00:55.479898082 +0000
+++ shell.py 2015-08-21 14:06:52.281803726 +0000
@@ -86,12 +86,6 @@ ' This option is not necessary if your ' 'key is prepended to your cert file.')
- parser.add_argument('--ca-file',
- help='Path of CA SSL certificate(s) used to verify'
- ' the remote server certificate. Without '
- 'this option glance looks for the default '
- 'system CA certificates.')
- parser.add_argument('--api-timeout', help='Number of seconds to wait for an ' 'API response, '
@@ -324,7 +318,7 @@
kwargs = { 'token': token, 'insecure': args.insecure,
- 'ca_file': args.ca_file,
+ 'cacert': args.os_cacert, 'cert_file': args.cert_file, 'key_file': args.key_file, 'username': args.os_username,
Suggested changes (disable ca-file option at all replacing it by os-cacert):
--- common/http.py.orig 2015-08-21 13:38:41.885823197 +0000
self. timeout = kwargs. get('timeout' )
+++ common/http.py 2015-08-21 13:56:29.271491786 +0000
@@ -66,7 +66,7 @@
- 'ca_file': kwargs.
+ 'cacert': kwargs.
@@ -77,7 +77,7 @@
if kwargs.
else:
- self.verify_cert = kwargs.
+ self.verify_cert = kwargs.
def log_curl_ request( self, method, url, kwargs):
conn_ params_ fmt = [
( 'key_file' , '--key %s'),
( 'cert_file' , '--cert %s'), connection_ params. get(key)
curl = ['curl -i -X %s' % method]
@@ -90,7 +90,7 @@
- ('ca_file', '--cacert %s'),
+ ('cacert', '--cacert %s'),
]
for (key, fmt) in conn_params_fmt:
value = self.ssl_
And:
' This option is not necessary if your '
' key is prepended to your cert file.')
--- shell.py.orig 2015-08-21 14:00:55.479898082 +0000
+++ shell.py 2015-08-21 14:06:52.281803726 +0000
@@ -86,12 +86,6 @@
- parser. add_argument( '--ca-file' ,
parser. add_argument( '--api- timeout' ,
help=' Number of seconds to wait for an '
' API response, '
'token' : token,
'insecure' : args.insecure,
'cert_ file': args.cert_file,
'key_ file': args.key_file,
'username' : args.os_username,
- help='Path of CA SSL certificate(s) used to verify'
- ' the remote server certificate. Without '
- 'this option glance looks for the default '
- 'system CA certificates.')
-
@@ -324,7 +318,7 @@
kwargs = {
- 'ca_file': args.ca_file,
+ 'cacert': args.os_cacert,
--- tests/test_ common_ http.py. orig 2015-08-21 14:08:19.467246759 +0000 common_ http.py 2015-08-21 14:17:24.004259346 +0000
self. assertFalse( client. verify_ cert)
+++ tests/test_
@@ -448,7 +448,7 @@
def test_passed_ cert_to_ verify_ cert(self, mock_request): /foo', ca_file="NOWHERE") /foo', cacert="NOWHERE")
self. assertEqual( "NOWHERE" , client.verify_cert)
- client = http.HTTPClient('https:/
+ client = http.HTTPClient('https:/
with mock.patch( 'muranoclient. common. http.get_ system_ ca_file' ) as gsf: