openstack/devstack
Code Issues Proposed changes

Merge "Allow installing keystoneauth from git"

Browse Source
This commit is contained in:
Jenkins 2015-07-23 14:17:49 +00:00 committed by Gerrit Code Review
commit 3805b3770c
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/keystone
View File

@ -35,6 +35,7 @@ set +o xtrace
# -------- # --------
# Set up default directories # Set up default directories
GITDIR["keystoneauth"]=$DEST/keystoneauth
GITDIR["python-keystoneclient"]=$DEST/python-keystoneclient GITDIR["python-keystoneclient"]=$DEST/python-keystoneclient
GITDIR["keystonemiddleware"]=$DEST/keystonemiddleware GITDIR["keystonemiddleware"]=$DEST/keystonemiddleware
KEYSTONE_DIR=$DEST/keystone KEYSTONE_DIR=$DEST/keystone
@ -488,6 +489,14 @@ function init_keystone {
fi fi
} }
# install_keystoneauth() - Collect source and prepare
function install_keystoneauth {
if use_library_from_git "keystoneauth"; then
git_clone_by_name "keystoneauth"
setup_dev_lib "keystoneauth"
fi
}
# install_keystoneclient() - Collect source and prepare # install_keystoneclient() - Collect source and prepare
function install_keystoneclient { function install_keystoneclient {
if use_library_from_git "python-keystoneclient"; then if use_library_from_git "python-keystoneclient"; then

1
stack.sh
View File

@ -750,6 +750,7 @@ echo_summary "Installing OpenStack project source"
install_oslo install_oslo
# Install client libraries # Install client libraries
install_keystoneauth
install_keystoneclient install_keystoneclient
install_glanceclient install_glanceclient
install_cinderclient install_cinderclient

4
stackrc
View File

@ -280,6 +280,10 @@ GITBRANCH["python-heatclient"]=${HEATCLIENT_BRANCH:-master}
GITREPO["python-ironicclient"]=${IRONICCLIENT_REPO:-${GIT_BASE}/openstack/python-ironicclient.git} GITREPO["python-ironicclient"]=${IRONICCLIENT_REPO:-${GIT_BASE}/openstack/python-ironicclient.git}
GITBRANCH["python-ironicclient"]=${IRONICCLIENT_BRANCH:-master} GITBRANCH["python-ironicclient"]=${IRONICCLIENT_BRANCH:-master}
# the base authentication plugins that clients use to authenticate
GITREPO["keystoneauth"]=${KEYSTONEAUTH_REPO:-${GIT_BASE}/openstack/keystoneauth.git}
GITBRANCH["keystoneauth"]=${KEYSTONEAUTH_BRANCH:-master}
# python keystone client library to nova that horizon uses # python keystone client library to nova that horizon uses
GITREPO["python-keystoneclient"]=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystoneclient.git} GITREPO["python-keystoneclient"]=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystoneclient.git}
GITBRANCH["python-keystoneclient"]=${KEYSTONECLIENT_BRANCH:-master} GITBRANCH["python-keystoneclient"]=${KEYSTONECLIENT_BRANCH:-master}

1
tests/test_libs_from_pypi.sh
View File

@ -41,6 +41,7 @@ ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient"
ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy" ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service" ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
ALL_LIBS+=" oslo.cache oslo.reports" ALL_LIBS+=" oslo.cache oslo.reports"
ALL_LIBS+=" keystoneauth"
# Generate the above list with # Generate the above list with
# echo ${!GITREPO[@]} # echo ${!GITREPO[@]}