summaryrefslogtreecommitdiffstats
path: root/snaps/openstack/os_credentials.py
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-07-21 09:43:08 -0600
committerspisarski <s.pisarski@cablelabs.com>2017-07-21 10:06:12 -0600
commit2b5271039308e95369d71504954fbd54643596db (patch)
tree8732f7afd03c7ba8110d2b55384395d84578a647 /snaps/openstack/os_credentials.py
parentb0af6e93bb5cc338c289577aad5c4b1bf8de7053 (diff)
Default OSCreds cacert attribute to False.
The default of True causes more problems than False when dealing with unsecure and secure (HTTPS) API calls. This was issue was found while testing against the new OPNFV CI test pod running Pike. JIRA: SNAPS-80 Change-Id: I819b4f64fa637bb7ce53c58a7a1164600ff6a3b9 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/os_credentials.py')
-rw-r--r--snaps/openstack/os_credentials.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/snaps/openstack/os_credentials.py b/snaps/openstack/os_credentials.py
index 17f65e6..4c681ac 100644
--- a/snaps/openstack/os_credentials.py
+++ b/snaps/openstack/os_credentials.py
@@ -97,12 +97,15 @@ class OSCreds:
else:
self.interface = kwargs['interface']
- self.cacert = kwargs.get('cacert', True)
- if isinstance(kwargs.get('cacert'), str):
- if file_utils.file_exists(kwargs['cacert']):
- self.cacert = kwargs['cacert']
+ self.cacert = False
+ if kwargs.get('cacert') is not None:
+ if isinstance(kwargs.get('cacert'), str):
+ if file_utils.file_exists(kwargs['cacert']):
+ self.cacert = kwargs['cacert']
+ else:
+ self.cacert = str2bool(kwargs['cacert'])
else:
- self.cacert = str2bool(self.cacert)
+ self.cacert = kwargs['cacert']
if isinstance(kwargs.get('proxy_settings'), ProxySettings):
self.proxy_settings = kwargs.get('proxy_settings')