@@ -34,6 +34,7 @@ set +o xtrace

 # Set up default directories

 GITDIR["python-keystoneclient"]=$DEST/python-keystoneclient

+GITDIR["keystonemiddleware"]=$DEST/keystonemiddleware

 KEYSTONE_DIR=$DEST/keystone

 KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone}

@@ -46,8 +47,6 @@ else

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

 fi

-KEYSTONEMIDDLEWARE_DIR=$DEST/keystonemiddleware

-

 # Set up additional extensions, such as oauth1, federation

 # Example of KEYSTONE_EXTENSIONS=oauth1,federation

 KEYSTONE_EXTENSIONS=${KEYSTONE_EXTENSIONS:-}

@@ -489,8 +488,10 @@ function install_keystoneclient {

 # install_keystonemiddleware() - Collect source and prepare

 function install_keystonemiddleware {

-    git_clone $KEYSTONEMIDDLEWARE_REPO $KEYSTONEMIDDLEWARE_DIR $KEYSTONEMIDDLEWARE_BRANCH

-    setup_install $KEYSTONEMIDDLEWARE_DIR

+    if use_library_from_git "keystonemiddleware"; then

+        git_clone_by_name "keystonemiddleware"

+        setup_dev_lib "keystonemiddleware"

+    fi

 }

 # install_keystone() - Collect source and prepare

@@ -354,8 +354,8 @@ GITREPO["django_openstack_auth"]=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/djang

 GITBRANCH["django_openstack_auth"]=${HORIZONAUTH_BRANCH:-master}

 # keystone middleware

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

-KEYSTONEMIDDLEWARE_BRANCH=${KEYSTONEMIDDLEWARE_BRANCH:-master}

+GITREPO["keystonemiddleware"]=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git}

+GITBRANCH["keystonemiddleware"]=${KEYSTONEMIDDLEWARE_BRANCH:-master}

 # s3 support for swift

 SWIFT3_REPO=${SWIFT3_REPO:-${GIT_BASE}/stackforge/swift3.git}