Browse code

Merge "Allow installing keystoneauth from git"

Jenkins authored on 2015/07/23 23:17:49
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
... ...
@@ -488,6 +489,14 @@ function init_keystone {
488 488
     fi
489 489
 }
490 490
 
491
+# install_keystoneauth() - Collect source and prepare
492
+function install_keystoneauth {
493
+    if use_library_from_git "keystoneauth"; then
494
+        git_clone_by_name "keystoneauth"
495
+        setup_dev_lib "keystoneauth"
496
+    fi
497
+}
498
+
491 499
 # install_keystoneclient() - Collect source and prepare
492 500
 function install_keystoneclient {
493 501
     if use_library_from_git "python-keystoneclient"; then
... ...
@@ -750,6 +750,7 @@ echo_summary "Installing OpenStack project source"
750 750
 install_oslo
751 751
 
752 752
 # Install client libraries
753
+install_keystoneauth
753 754
 install_keystoneclient
754 755
 install_glanceclient
755 756
 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[@]}