@@ -39,6 +39,7 @@ KEYSTONE_PASTE_INI=${KEYSTONE_PASTE_INI:-$KEYSTONE_CONF_DIR/keystone-paste.ini}

 KEYSTONE_AUTH_CACHE_DIR=${KEYSTONE_AUTH_CACHE_DIR:-/var/cache/keystone}

 KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone}

+KEYSTONEMIDDLEWARE_DIR=$DEST/keystonemiddleware

 KEYSTONECLIENT_DIR=$DEST/python-keystoneclient

 # Set up additional extensions, such as oauth1, federation

@@ -438,6 +439,12 @@ function install_keystoneclient {

     sudo install -D -m 0644 -o $STACK_USER {$KEYSTONECLIENT_DIR/tools/,/etc/bash_completion.d/}keystone.bash_completion

 }

+# install_keystonemiddleware() - Collect source and prepare

+function install_keystonemiddleware {

+    git_clone $KEYSTONEMIDDLEWARE_REPO $KEYSTONEMIDDLEWARE_DIR $KEYSTONEMIDDLEWARE_BRANCH

+    setup_install $KEYSTONEMIDDLEWARE_DIR

+}

+

 # install_keystone() - Collect source and prepare

 function install_keystone {

     # only install ldap if the service has been enabled

@@ -722,6 +722,9 @@ if is_service_enabled heat horizon; then

     install_heatclient

 fi

+# Install middleware

+install_keystonemiddleware

+

 git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH

 setup_develop $OPENSTACKCLIENT_DIR

@@ -153,6 +153,10 @@ KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master}

 KEYSTONECLIENT_REPO=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystoneclient.git}

 KEYSTONECLIENT_BRANCH=${KEYSTONECLIENT_BRANCH:-master}

+# keystone middleware

+KEYSTONEMIDDLEWARE_REPO=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git}

+KEYSTONEMIDDLEWARE_BRANCH=${KEYSTONEMIDDLEWARE_BRANCH:-master}

+

 # compute service

 NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git}

 NOVA_BRANCH=${NOVA_BRANCH:-master}