From e6dd4e665d2a10e7cbbf2d0c35011700ddabf0ad Mon Sep 17 00:00:00 2001
From: Morgan Fainberg <morgan.fainberg@gmail.com>
Date: Wed, 25 Jun 2014 17:25:25 -0700
Subject: [PATCH] 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
---
 README.md    | 2 ++
 lib/keystone | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7185e9da39..7eacebdc1e 100644
--- a/README.md
+++ b/README.md
@@ -143,6 +143,8 @@ mod_wsgi set ``ENABLE_HTTPD_MOD_WSGI_SERVICES`` to ``False`` in your
 Each service that can be run under HTTPD + mod_wsgi also has an override
 toggle available that can be set in your ``local.conf``.
 
+Keystone is run under HTTPD + mod_wsgi by default.
+
 Example (Keystone):
 
     KEYSTONE_USE_MOD_WSGI="True"
diff --git a/lib/keystone b/lib/keystone
index ec124cbaaa..86f1c37bc7 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -47,7 +47,7 @@ KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
 KEYSTONE_EXTENSIONS=${KEYSTONE_EXTENSIONS:-}
 
 # Toggle for deploying Keystone under HTTPD + mod_wsgi
-KEYSTONE_USE_MOD_WSGI=${KEYSTONE_USE_MOD_WSGI:-False}
+KEYSTONE_USE_MOD_WSGI=${KEYSTONE_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVICES}}
 
 # Select the backend for Keystone's service catalog
 KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql}