support installing clients at released versions
expand the devstack support for libraries from released versions to
support python-* clients and tempest_lib.
Depends-On: I81b0d228e7769758c61e5b0323ecfce8c8886d39
Change-Id: I26fac0ccf8fd4818e24618d56bf04b32306f88f6
diff --git a/lib/keystone b/lib/keystone
index 276e971..6341ce2 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -33,6 +33,8 @@
# --------
# Set up default directories
+GITDIR["keystoneclient"]=$DEST/python-keystoneclient
+
KEYSTONE_DIR=$DEST/keystone
KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone}
KEYSTONE_CONF=$KEYSTONE_CONF_DIR/keystone.conf
@@ -45,7 +47,6 @@
fi
KEYSTONEMIDDLEWARE_DIR=$DEST/keystonemiddleware
-KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
# Set up additional extensions, such as oauth1, federation
# Example of KEYSTONE_EXTENSIONS=oauth1,federation
@@ -479,9 +480,11 @@
# install_keystoneclient() - Collect source and prepare
function install_keystoneclient {
- git_clone $KEYSTONECLIENT_REPO $KEYSTONECLIENT_DIR $KEYSTONECLIENT_BRANCH
- setup_develop $KEYSTONECLIENT_DIR
- sudo install -D -m 0644 -o $STACK_USER {$KEYSTONECLIENT_DIR/tools/,/etc/bash_completion.d/}keystone.bash_completion
+ if use_library_from_git "keystoneclient"; then
+ git_clone_by_name "keystoneclient"
+ setup_develop "keystoneclient"
+ sudo install -D -m 0644 -o $STACK_USER {$KEYSTONECLIENT_DIR/tools/,/etc/bash_completion.d/}keystone.bash_completion
+ fi
}
# install_keystonemiddleware() - Collect source and prepare