From 6a5e56eed3d48d7902a77df3d8f1400fe499a828 Mon Sep 17 00:00:00 2001 From: Saad Zaher Date: Mon, 13 Feb 2017 15:28:08 +0000 Subject: [PATCH] Fix ssl connections Change-Id: I7a1dce63346247bbbd2f73711e110f4713580933 --- freezerclient/shell.py | 2 +- freezerclient/v1/client.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/freezerclient/shell.py b/freezerclient/shell.py index 73e8a21..9e4e622 100644 --- a/freezerclient/shell.py +++ b/freezerclient/shell.py @@ -241,8 +241,8 @@ class FreezerShell(app.App): 'user_domain_id': self.options.os_user_domain_id, 'project_domain_name': self.options.os_project_domain_name, 'project_domain_id': self.options.os_project_domain_id, - 'verify': True or self.options.os_cacert, 'cert': self.options.os_cert, + 'cacert': self.options.os_cacert, 'insecure': self.options.insecure } return client.Client(**opts) diff --git a/freezerclient/v1/client.py b/freezerclient/v1/client.py index aeb537b..e396e5e 100644 --- a/freezerclient/v1/client.py +++ b/freezerclient/v1/client.py @@ -87,7 +87,7 @@ class Client(object): endpoint_type=None, opts=None, project_name=None, user_domain_name=None, user_domain_id=None, project_domain_name=None, project_domain_id=None, - verify=True, cert=None, insecure=False): + cert=None, cacert=None, insecure=False): """ Initialize a new client for the Disaster Recovery v1 API. :param version: keystone version to use @@ -131,14 +131,18 @@ class Client(object): self.opts.os_project_domain_name = project_domain_name or None self.opts.os_project_domain_id = project_domain_id or None self.opts.auth_version = version + self.opts.os_cacert = cacert or None + self.opts.insecure = insecure + self.opts.cert = cert else: self.opts = opts self.cert = cert + self.cacert = cacert self._session = session - if insecure: + verify = self.opts.os_cacert + if self.opts.insecure: verify = False - self.verify = verify self.validate() @@ -154,7 +158,8 @@ class Client(object): return self._session auth_plugin = get_auth_plugin(self.opts) return ksa_session.Session(auth=auth_plugin, - verify=self.verify, + verify=(self.cacert or + not self.opts.insecure), cert=self.cert) @utils.CachedProperty