commit 3350542a44359b1493f3ee60f1ba6176c1d3d021
author Jenkins <jenkins@review.openstack.org> Wed Jun 14 16:09:11 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jun 14 16:09:11 2017 +0000
tree 9aba7c1e2cc45e2aa03d1f7c5c27b7b106d8f40c
parent 29215d95c7d979f45166d87338fe68549286fb38
parent e28db4c2f297c8438fdc614954339f9178c07d54

Merge "Set swift functest config when using tls"

lib/swift

diff --git a/lib/swift b/lib/swift
index 1472e44..e247f15 100644
--- a/lib/swift
+++ b/lib/swift
@@ -542,6 +542,10 @@
         else
             iniset ${testfile} func_test auth_prefix /identity/v2.0/
         fi
+        if is_service_enabled tls-proxy; then
+            iniset ${testfile} func_test cafile ${SSL_BUNDLE_FILE}
+            iniset ${testfile} func_test web_front_end apache2
+        fi
     fi
 
     local user_group