Skip to content

Commit e28db4c

Browse files
committed
Set swift functest config when using tls
Because the swift functests (which use test.conf) run out of a virtualenv they don't get access to the system wide trust of the devstack CA. Handle this by explicitly configuring the cafile to trust in the test.conf file. We also set the web_front_end to apache2 as that is what is terminating TLS for us. The tests handle different web server behaviors using this flag. Swift's functests will need to read these values in and properly configure things on its end. Change-Id: I4cdba36ccab6acd76205184882ee29e4f1e12333
1 parent dc9ef55 commit e28db4c

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

lib/swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,10 @@ EOF
541541
else
542542
iniset ${testfile} func_test auth_prefix /identity/v2.0/
543543
fi
544+
if is_service_enabled tls-proxy; then
545+
iniset ${testfile} func_test cafile ${SSL_BUNDLE_FILE}
546+
iniset ${testfile} func_test web_front_end apache2
547+
fi
544548
fi
545549

546550
local user_group

0 commit comments

Comments
 (0)