From 5954fe677b106d33683285692a6d0ff46f70e775 Mon Sep 17 00:00:00 2001
From: ramboman <lijie@unitedstack.com>
Date: Sun, 10 May 2020 12:58:02 +0800
Subject: [PATCH] add the verify for the session

We run the octavia scenario test failed when the OpenStack env
enable TLS. So we need add the verify for the session.

Story: 2007662
Task:  39754
Closes-Bug: #1877818
(cherry picked from commit f26ab8b97be7a478fdd391c9e31a5c1a86a2a3cf)

Change-Id: Ie71db27dc383c93496c1dfd69f486a4fd02b597e
---
 octavia/certificates/common/auth/barbican_acl.py             | 4 +++-
 .../notes/fix-barbican-client-verfiy-689be1b9389bd1d8.yaml   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/fix-barbican-client-verfiy-689be1b9389bd1d8.yaml

diff --git a/octavia/certificates/common/auth/barbican_acl.py b/octavia/certificates/common/auth/barbican_acl.py
index 39b250fabe..c86fc04d38 100644
--- a/octavia/certificates/common/auth/barbican_acl.py
+++ b/octavia/certificates/common/auth/barbican_acl.py
@@ -87,7 +87,9 @@ class BarbicanACLAuth(barbican_common.BarbicanAuth):
         user_auth = token.Token(auth_url=service_auth.auth_url,
                                 token=context.auth_token,
                                 project_id=context.project_id)
-        user_session = session.Session(auth=user_auth)
+        user_session = session.Session(
+            auth=user_auth,
+            verify=CONF.certificates.ca_certificates_file)
 
         # create a special barbican client with our user's session
         return barbican_client.Client(
diff --git a/releasenotes/notes/fix-barbican-client-verfiy-689be1b9389bd1d8.yaml b/releasenotes/notes/fix-barbican-client-verfiy-689be1b9389bd1d8.yaml
new file mode 100644
index 0000000000..4943ac2350
--- /dev/null
+++ b/releasenotes/notes/fix-barbican-client-verfiy-689be1b9389bd1d8.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix an issue when the barbican service enable TLS, we create the listerner
+    failed.