Browse code

Merge "Enable Keystone under Apache by default"

Jenkins authored on 2014/07/11 08:06:57
Showing 2 changed files
... ...
@@ -143,6 +143,8 @@ mod_wsgi set ``ENABLE_HTTPD_MOD_WSGI_SERVICES`` to ``False`` in your
143 143
 Each service that can be run under HTTPD + mod_wsgi also has an override
144 144
 toggle available that can be set in your ``local.conf``.
145 145
 
146
+Keystone is run under HTTPD + mod_wsgi by default.
147
+
146 148
 Example (Keystone):
147 149
 
148 150
     KEYSTONE_USE_MOD_WSGI="True"
... ...
@@ -47,7 +47,7 @@ KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
47 47
 KEYSTONE_EXTENSIONS=${KEYSTONE_EXTENSIONS:-}
48 48
 
49 49
 # Toggle for deploying Keystone under HTTPD + mod_wsgi
50
-KEYSTONE_USE_MOD_WSGI=${KEYSTONE_USE_MOD_WSGI:-False}
50
+KEYSTONE_USE_MOD_WSGI=${KEYSTONE_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVICES}}
51 51
 
52 52
 # Select the backend for Keystone's service catalog
53 53
 KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql}