From 7297019b648abbd4e95ea44e76c5318b86e4000d Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Thu, 27 Aug 2020 14:20:22 -0500 Subject: [PATCH] Fix openstack-exporter not supporting TLS This change adds in the arguements for having the prometheus-openstack-exporter support making request calls with a given certificate. Change-Id: Ifcbb030e3f527bd740da9e2771838a69b5d7b26c --- prometheus-openstack-exporter/exporter/osclient.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/prometheus-openstack-exporter/exporter/osclient.py b/prometheus-openstack-exporter/exporter/osclient.py index a5e73fb..d85f3a3 100644 --- a/prometheus-openstack-exporter/exporter/osclient.py +++ b/prometheus-openstack-exporter/exporter/osclient.py @@ -38,7 +38,7 @@ class OSClient(object): username, user_domain, region, - verify, + cacert, timeout, retries): self.keystone_url = keystone_url @@ -52,8 +52,9 @@ class OSClient(object): self.token = None self.valid_until = None self.session = requests.Session() - if verify is not None: - self.session.verify = verify + if cacert: + self.cacert = cacert + self.session.verify = cacert self.session.mount( 'http://', requests.adapters.HTTPAdapter(max_retries=retries)) self.session.mount( @@ -165,6 +166,8 @@ class OSClient(object): 'timeout': self.timeout, 'headers': {'Content-type': 'application/json'} } + if self.cacert: + kwargs['verify'] = self.cacert if token_required and not self.is_valid_token(): self.get_token() if not self.is_valid_token():