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/glance

diff --git a/lib/glance b/lib/glance
index 8d95aad..a31e564 100644
--- a/lib/glance
+++ b/lib/glance
@@ -383,8 +383,8 @@
 function start_glance {
     local service_protocol=$GLANCE_SERVICE_PROTOCOL
     if is_service_enabled tls-proxy; then
-        start_tls_proxy '*' $GLANCE_SERVICE_PORT $GLANCE_SERVICE_HOST $GLANCE_SERVICE_PORT_INT &
-        start_tls_proxy '*' $GLANCE_REGISTRY_PORT $GLANCE_SERVICE_HOST $GLANCE_REGISTRY_PORT_INT &
+        start_tls_proxy glance-service '*' $GLANCE_SERVICE_PORT $GLANCE_SERVICE_HOST $GLANCE_SERVICE_PORT_INT
+        start_tls_proxy glance-registry '*' $GLANCE_REGISTRY_PORT $GLANCE_SERVICE_HOST $GLANCE_REGISTRY_PORT_INT
     fi
 
     run_process g-reg "$GLANCE_BIN_DIR/glance-registry --config-file=$GLANCE_CONF_DIR/glance-registry.conf"