Add WSGI_MODE setting for target

This is needed because we're changing up some things in devstack, and
this ensures the pike defaults don't flip the deployment mode mid way
through an ocata upgrade.

Change-Id: I5aa1e3017365df120fa8c8ea676c63ddf99f21b4

devstack.local.conf.target

@@ -29,3 +29,7 @@ VOLUME_BACKING_FILE_SIZE=10000M
 enable_service s-account s-container s-object s-proxy
 SWIFT_HASH=8213897fads879789asdf789
 SWIFT_REPLICAS=1
+
+# because this was the default in ocata, remove after pike has
+# shipped.
+WSGI_MODE="mod_wsgi"

grenade.sh

@@ -219,6 +219,10 @@ load_settings
 # isn't run there. This has to be run after load_settings because
 # plugins might change the service list during this phase.
 
+# Remove in Queens
+# Set WSGI_MODE to mod_wsgi
+devstack_localrc target "WSGI_MODE=mod_wsgi"
+
 extract_localrc_section $TARGET_DEVSTACK_DIR/local.conf \
                         $TARGET_DEVSTACK_DIR/localrc \
                         $TARGET_DEVSTACK_DIR/.localrc.auto

prep-target

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -o error
+
 # ``prep-target`` handles the preparations for installing and configuring
 # the "target" configuration of DevStack.
 
@@ -8,6 +10,7 @@
 GRENADE_DIR=$(cd $(dirname "$0") && pwd)
 
 # Source params
+source $GRENADE_DIR/inc/bootstrap
 source $GRENADE_DIR/grenaderc
 
 # Import common functions

projects/10_keystone/upgrade.sh

@@ -66,12 +66,6 @@ start_keystone
 # ensure the service has started
 ensure_services_started keystone
 
-# TODO(sdague): we should probably check that apache looks like it's
-# logging, but this will let us pass for now.
-if [[ "$KEYSTONE_USE_MOD_WSGI" != "True" ]]; then
-    ensure_logs_exist key
-fi
-
 set +o xtrace
 echo "*********************************************************************"
 echo "SUCCESS: End $0"