openstack/devstack
Code Issues Proposed changes

move keystonemiddleware to pypi libs

Browse Source 
Make keystonemiddleware install from pypi releases by default

Change-Id: I3dc4b096b4184f4cf00fb0df66b76fcc8f19785b
This commit is contained in:
Sean Dague 2014-11-14 11:35:56 -05:00
parent 3c8973a90a
commit 658312ca2f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/keystone
View File

@ -34,6 +34,7 @@ set +o xtrace
# Set up default directories # Set up default directories
GITDIR["python-keystoneclient"]=$DEST/python-keystoneclient GITDIR["python-keystoneclient"]=$DEST/python-keystoneclient
GITDIR["keystonemiddleware"]=$DEST/keystonemiddleware
KEYSTONE_DIR=$DEST/keystone KEYSTONE_DIR=$DEST/keystone
KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone} KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone}
@ -46,8 +47,6 @@ else
KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone} KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone}
fi fi
KEYSTONEMIDDLEWARE_DIR=$DEST/keystonemiddleware
# Set up additional extensions, such as oauth1, federation # Set up additional extensions, such as oauth1, federation
# Example of KEYSTONE_EXTENSIONS=oauth1,federation # Example of KEYSTONE_EXTENSIONS=oauth1,federation
KEYSTONE_EXTENSIONS=${KEYSTONE_EXTENSIONS:-} KEYSTONE_EXTENSIONS=${KEYSTONE_EXTENSIONS:-}
@ -489,8 +488,10 @@ function install_keystoneclient {
# install_keystonemiddleware() - Collect source and prepare # install_keystonemiddleware() - Collect source and prepare
function install_keystonemiddleware { function install_keystonemiddleware {
git_clone $KEYSTONEMIDDLEWARE_REPO $KEYSTONEMIDDLEWARE_DIR $KEYSTONEMIDDLEWARE_BRANCH if use_library_from_git "keystonemiddleware"; then
setup_install $KEYSTONEMIDDLEWARE_DIR git_clone_by_name "keystonemiddleware"
setup_dev_lib "keystonemiddleware"
fi
} }
# install_keystone() - Collect source and prepare # install_keystone() - Collect source and prepare

4
stackrc
View File

@ -354,8 +354,8 @@ GITREPO["django_openstack_auth"]=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/djang
GITBRANCH["django_openstack_auth"]=${HORIZONAUTH_BRANCH:-master} GITBRANCH["django_openstack_auth"]=${HORIZONAUTH_BRANCH:-master}
# keystone middleware # keystone middleware
KEYSTONEMIDDLEWARE_REPO=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git} GITREPO["keystonemiddleware"]=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git}
KEYSTONEMIDDLEWARE_BRANCH=${KEYSTONEMIDDLEWARE_BRANCH:-master} GITBRANCH["keystonemiddleware"]=${KEYSTONEMIDDLEWARE_BRANCH:-master}
# s3 support for swift # s3 support for swift
SWIFT3_REPO=${SWIFT3_REPO:-${GIT_BASE}/stackforge/swift3.git} SWIFT3_REPO=${SWIFT3_REPO:-${GIT_BASE}/stackforge/swift3.git}