Allow installing keystoneauth from git
Keystoneauth is not marked as stable yet however to ensure that the
integration between it, keystoneclient and other services don't break
compatibility we want to test it with tempest.
Unfortunately you can't put -e links in requirements.txt files so add
it to devstack so we can set the test environment. This will also make
it available when keystoneauth is released.
Change-Id: I43ca1df9c6ae2f0ac1a687c9ce1e2ccb97e81652
diff --git a/lib/keystone b/lib/keystone
index c33d466..baa4f8c 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -35,6 +35,7 @@
# --------
# Set up default directories
+GITDIR["keystoneauth"]=$DEST/keystoneauth
GITDIR["python-keystoneclient"]=$DEST/python-keystoneclient
GITDIR["keystonemiddleware"]=$DEST/keystonemiddleware
KEYSTONE_DIR=$DEST/keystone
@@ -483,6 +484,14 @@
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
function install_keystoneclient {
if use_library_from_git "python-keystoneclient"; then
diff --git a/stack.sh b/stack.sh
index 17cbe75..1610651 100755
--- a/stack.sh
+++ b/stack.sh
@@ -741,6 +741,7 @@
install_oslo
# Install client libraries
+install_keystoneauth
install_keystoneclient
install_glanceclient
install_cinderclient
diff --git a/stackrc b/stackrc
index 342f9bf..eb0c330 100644
--- a/stackrc
+++ b/stackrc
@@ -280,6 +280,10 @@
GITREPO["python-ironicclient"]=${IRONICCLIENT_REPO:-${GIT_BASE}/openstack/python-ironicclient.git}
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
GITREPO["python-keystoneclient"]=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystoneclient.git}
GITBRANCH["python-keystoneclient"]=${KEYSTONECLIENT_BRANCH:-master}
diff --git a/tests/test_libs_from_pypi.sh b/tests/test_libs_from_pypi.sh
index 8dc3ba3..d10cd0e 100755
--- a/tests/test_libs_from_pypi.sh
+++ b/tests/test_libs_from_pypi.sh
@@ -41,6 +41,7 @@
ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
ALL_LIBS+=" oslo.cache oslo.reports"
+ALL_LIBS+=" keystoneauth"
# Generate the above list with
# echo ${!GITREPO[@]}