Browse code

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

Jamie Lennox authored on 2015/07/03 10:54:38
Showing 4 changed files
... ...
@@ -35,6 +35,7 @@ set +o xtrace
35 35
 # --------
36 36
 
37 37
 # Set up default directories
38
+GITDIR["keystoneauth"]=$DEST/keystoneauth
38 39
 GITDIR["python-keystoneclient"]=$DEST/python-keystoneclient
39 40
 GITDIR["keystonemiddleware"]=$DEST/keystonemiddleware
40 41
 KEYSTONE_DIR=$DEST/keystone
... ...
@@ -483,6 +484,14 @@ function init_keystone {
483 483
     fi
484 484
 }
485 485
 
486
+# install_keystoneauth() - Collect source and prepare
487
+function install_keystoneauth {
488
+    if use_library_from_git "keystoneauth"; then
489
+        git_clone_by_name "keystoneauth"
490
+        setup_dev_lib "keystoneauth"
491
+    fi
492
+}
493
+
486 494
 # install_keystoneclient() - Collect source and prepare
487 495
 function install_keystoneclient {
488 496
     if use_library_from_git "python-keystoneclient"; then
... ...
@@ -741,6 +741,7 @@ echo_summary "Installing OpenStack project source"
741 741
 install_oslo
742 742
 
743 743
 # Install client libraries
744
+install_keystoneauth
744 745
 install_keystoneclient
745 746
 install_glanceclient
746 747
 install_cinderclient
... ...
@@ -280,6 +280,10 @@ GITBRANCH["python-heatclient"]=${HEATCLIENT_BRANCH:-master}
280 280
 GITREPO["python-ironicclient"]=${IRONICCLIENT_REPO:-${GIT_BASE}/openstack/python-ironicclient.git}
281 281
 GITBRANCH["python-ironicclient"]=${IRONICCLIENT_BRANCH:-master}
282 282
 
283
+# the base authentication plugins that clients use to authenticate
284
+GITREPO["keystoneauth"]=${KEYSTONEAUTH_REPO:-${GIT_BASE}/openstack/keystoneauth.git}
285
+GITBRANCH["keystoneauth"]=${KEYSTONEAUTH_BRANCH:-master}
286
+
283 287
 # python keystone client library to nova that horizon uses
284 288
 GITREPO["python-keystoneclient"]=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystoneclient.git}
285 289
 GITBRANCH["python-keystoneclient"]=${KEYSTONECLIENT_BRANCH:-master}
... ...
@@ -41,6 +41,7 @@ ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient"
41 41
 ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
42 42
 ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
43 43
 ALL_LIBS+=" oslo.cache oslo.reports"
44
+ALL_LIBS+=" keystoneauth"
44 45
 
45 46
 # Generate the above list with
46 47
 # echo ${!GITREPO[@]}