1. devstack
  2. Commit e6dd4e665d2a10e7cbbf2d0c35011700ddabf0ad
Browse code

Enable Keystone under Apache by default

Make the default run mode of Keystone HTTPD + mod_wsgi. This will
enable gating on Keystone under mod_wsgi.

Depends On: https://review.openstack.org/#/c/100764/

Change-Id: I4b664a1d6c9bbb1ff999158f3a8c8ab3bd8d891b

Morgan Fainberg authored on 2014/06/26 09:25:25
Showing 2 changed files
README.md
History View file @ e6dd4e6
... ... 
@@ -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"
lib/keystone
History View file @ e6dd4e6
... ... 
@@ -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}