commit 4b49e409f853104dae021dfca1a9342ec9ac4709
author Gregory Haynes <greg@greghaynes.net> Wed Aug 31 18:19:51 2016 -0700
committer Clark Boylan <clark.boylan@gmail.com> Tue Sep 20 08:14:11 2016 -0700
tree dc27f7ff83839baa55b459ca4aa2230c4ed19439
parent fb1e1cc7e3de4483de48661b03a4417e2d24957a

Use apache for tls-proxy ssl termination

Stud is now abandonware (see https://github.com/bumptech/stud) and is
not packaged in xenial. Lets use Apache for SSL termination since its
there already.

Change-Id: Ifcba410f5969521e8b3d30f02795541c1661f83a

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index 6198e43..f52cc3f 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -609,8 +609,8 @@
 
     # Start proxies if enabled
     if is_service_enabled tls-proxy; then
-        start_tls_proxy '*' $KEYSTONE_SERVICE_PORT $KEYSTONE_SERVICE_HOST $KEYSTONE_SERVICE_PORT_INT &
-        start_tls_proxy '*' $KEYSTONE_AUTH_PORT $KEYSTONE_AUTH_HOST $KEYSTONE_AUTH_PORT_INT &
+        start_tls_proxy keystone-service '*' $KEYSTONE_SERVICE_PORT $KEYSTONE_SERVICE_HOST $KEYSTONE_SERVICE_PORT_INT
+        start_tls_proxy keystone-auth '*' $KEYSTONE_AUTH_PORT $KEYSTONE_AUTH_HOST $KEYSTONE_AUTH_PORT_INT
     fi
 
     # (re)start memcached to make sure we have a clean memcache.