gistfile1.diff

diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.
index 7440ec9..718337d 100644
--- a/packstack/plugins/keystone_100.py
+++ b/packstack/plugins/keystone_100.py
@@ -87,6 +87,19 @@ def initConfig(controller):
          "USE_DEFAULT": True,
          "NEED_CONFIRM": False,
          "CONDITION": False},
+
+        {"CMD_OPTION": "keystone-use-wsgi",
+         "USAGE": "yes - setup apache and keystone to use mod_wsgi",
+         "PROMPT": "Use apache and keystone with mod_wsgi?",
+         "OPTION_LIST": ['y', 'n'],
+         "VALIDATORS": [validators.validate_options],
+         "DEFAULT_VALUE": "n",
+         "MASK_INPUT": False,
+         "LOOSE_VALIDATION": False,
+         "CONF_NAME": 'CONFIG_KEYSTONE_USE_WSGI',
+         "USE_DEFAULT": True,
+         "NEED_CONFIRM": False,
+         "CONDITION": False},
     ]
     group = {"GROUP_NAME": "KEYSTONE",
              "DESCRIPTION": "Keystone Config parameters",
diff --git a/packstack/puppet/templates/keystone.pp b/packstack/puppet/templates
index 111ac28..8ad24bd 100644
--- a/packstack/puppet/templates/keystone.pp
+++ b/packstack/puppet/templates/keystone.pp
@@ -5,6 +5,7 @@ class {"keystone":
     token_format => "%(CONFIG_KEYSTONE_TOKEN_FORMAT)s",
     verbose => true,
     debug => %(CONFIG_DEBUG_MODE)s,
+    use_wsgi => %(CONFIG_KEYSTONE_USE_WSGI)s,
 }
 
 class {"keystone::roles::admin":