Browse code

Merge "Add castellan to LIBS_FROM_GIT"

Jenkins authored on 2017/04/19 21:33:06
Showing 3 changed files
... ...
@@ -23,6 +23,7 @@ set +o xtrace
23 23
 # Defaults
24 24
 # --------
25 25
 GITDIR["automaton"]=$DEST/automaton
26
+GITDIR["castellan"]=$DEST/castellan
26 27
 GITDIR["cliff"]=$DEST/cliff
27 28
 GITDIR["debtcollector"]=$DEST/debtcollector
28 29
 GITDIR["futurist"]=$DEST/futurist
... ...
@@ -71,6 +72,7 @@ function _do_install_oslo_lib {
71 71
 # install_oslo() - Collect source and prepare
72 72
 function install_oslo {
73 73
     _do_install_oslo_lib "automaton"
74
+    _do_install_oslo_lib "castellan"
74 75
     _do_install_oslo_lib "cliff"
75 76
     _do_install_oslo_lib "debtcollector"
76 77
     _do_install_oslo_lib "futurist"
... ...
@@ -370,6 +370,10 @@ GITDIR["python-openstackclient"]=$DEST/python-openstackclient
370 370
 #
371 371
 ###################
372 372
 
373
+# castellan key manager interface
374
+GITREPO["castellan"]=${CASTELLAN_REPO:-${GIT_BASE}/openstack/castellan.git}
375
+GITBRANCH["castellan"]=${CASTELLAN_BRANCH:-master}
376
+
373 377
 # cliff command line framework
374 378
 GITREPO["cliff"]=${CLIFF_REPO:-${GIT_BASE}/openstack/cliff.git}
375 379
 GITBRANCH["cliff"]=${CLIFF_BRANCH:-master}
... ...
@@ -43,6 +43,7 @@ ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
43 43
 ALL_LIBS+=" oslo.cache oslo.reports osprofiler"
44 44
 ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep"
45 45
 ALL_LIBS+=" diskimage-builder os-vif python-brick-cinderclient-ext"
46
+ALL_LIBS+=" castellan"
46 47
 
47 48
 # Generate the above list with
48 49
 # echo ${!GITREPO[@]}