From de6d7e08ca5a058449ed20a8850b6425914cdbe8 Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Sun, 28 Jun 2020 02:00:36 +0000 Subject: [PATCH] Pick up cafile from keystone_auth If ca_file is not specified in client config, use the cafile config from keystone_auth session. Change-Id: I99f9633ddf84d0b1809bbea87275b68412f7ed6a Closes-Bug: #1885401 --- zun/common/clients.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/zun/common/clients.py b/zun/common/clients.py index 63d1fdaa7..0f39803c2 100644 --- a/zun/common/clients.py +++ b/zun/common/clients.py @@ -84,7 +84,8 @@ class OpenStackClients(object): return self._neutron session = self.keystone().session - session.verify = self._get_client_option('neutron', 'ca_file') or True + if self._get_client_option('neutron', 'ca_file'): + session.verify = self._get_client_option('neutron', 'ca_file') if self._get_client_option('neutron', 'insecure'): session.verify = False endpoint_type = self._get_client_option('neutron', 'endpoint_type') @@ -101,7 +102,8 @@ class OpenStackClients(object): return self._cinder session = self.keystone().session - session.verify = self._get_client_option('cinder', 'ca_file') or True + if self._get_client_option('cinder', 'ca_file'): + session.verify = self._get_client_option('cinder', 'ca_file') if self._get_client_option('cinder', 'insecure'): session.verify = False cinder_api_version = self._get_client_option('cinder', 'api_version') @@ -125,8 +127,8 @@ class OpenStackClients(object): return self._placement, self._placement_ks_filter session = self.keystone().session - session.verify = \ - self._get_client_option('placement', 'ca_file') or True + if self._get_client_option('placement', 'ca_file'): + session.verify = self._get_client_option('placement', 'ca_file') if self._get_client_option('placement', 'insecure'): session.verify = False region_name = self._get_client_option('placement', 'region_name')