commit a1e1f5128a22a7d0cdc8136063d27d64c270021d
author Rob Crittenden <rcritten@redhat.com> Wed Jul 20 18:12:09 2016 -0400
committer Rob Crittenden <rcritten@redhat.com> Wed Jul 20 18:15:00 2016 -0400
tree ba77b5a196c66099d0437dd2d3b85dc621e0d9fe
parent 61b319787bbd0af7f3cc1feb71cef0bef6dab373

Add keystone VirtualHost for port 443 when USE_SSL is True

Add a VirtualHost that defines the necessary options for
enabling SSL. The existing keystone Apache configuration already
does all the location handling.

Change-Id: I836a471a7258f14f051d3dd8bdb428286b5a11aa

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index 6198e43..810acac 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -161,6 +161,7 @@
 function _config_keystone_apache_wsgi {
     local keystone_apache_conf
     keystone_apache_conf=$(apache_site_config_for keystone)
+    keystone_ssl_listen="#"
     local keystone_ssl=""
     local keystone_certfile=""
     local keystone_keyfile=""
@@ -169,6 +170,7 @@
     local venv_path=""
 
     if is_ssl_enabled_service key; then
+        keystone_ssl_listen=""
         keystone_ssl="SSLEngine On"
         keystone_certfile="SSLCertificateFile $KEYSTONE_SSL_CERT"
         keystone_keyfile="SSLCertificateKeyFile $KEYSTONE_SSL_KEY"
@@ -186,6 +188,7 @@
         s|%PUBLICPORT%|$keystone_service_port|g;
         s|%ADMINPORT%|$keystone_auth_port|g;
         s|%APACHE_NAME%|$APACHE_NAME|g;
+        s|%SSLLISTEN%|$keystone_ssl_listen|g;
         s|%SSLENGINE%|$keystone_ssl|g;
         s|%SSLCERTFILE%|$keystone_certfile|g;
         s|%SSLKEYFILE%|$keystone_keyfile|g;