Skip to content

Commit ed7dbe5

Browse files
kaitersgonnakaitsdague
authored andcommitted
Add python-barbicanclient to LIBS_FROM_GIT
Allow python-barbicanclient to be installed from git instead of pip. Change-Id: I99cd72724e11bab362bcaaeb773f33b2abfe815c
1 parent 7e41c6c commit ed7dbe5

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

lib/libraries

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ function install_libs {
121121
# os-traits for nova
122122
_install_lib_from_source "os-brick"
123123
_install_lib_from_source "os-traits"
124+
#
125+
# python client libraries we might need from git can go here
126+
_install_lib_from_source "python-barbicanclient"
124127

125128

126129
# etcd (because tooz does not have a hard dependency on these)

stackrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,11 @@ GITBRANCH["python-cinderclient"]=${CINDERCLIENT_BRANCH:-master}
341341
GITREPO["python-brick-cinderclient-ext"]=${BRICK_CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-brick-cinderclient-ext.git}
342342
GITBRANCH["python-brick-cinderclient-ext"]=${BRICK_CINDERCLIENT_BRANCH:-master}
343343

344+
# python barbican client library
345+
GITREPO["python-barbicanclient"]=${BARBICANCLIENT_REPO:-${GIT_BASE}/openstack/python-barbicanclient.git}
346+
GITBRANCH["python-barbicanclient"]=${BARBICANCLIENT_BRANCH:-master}
347+
GITDIR["python-barbicanclient"]=$DEST/python-barbicanclient
348+
344349
# python glance client library
345350
GITREPO["python-glanceclient"]=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}
346351
GITBRANCH["python-glanceclient"]=${GLANCECLIENT_BRANCH:-master}

tests/test_libs_from_pypi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ALL_LIBS+=" debtcollector os-brick os-traits automaton futurist oslo.service"
4343
ALL_LIBS+=" oslo.cache oslo.reports osprofiler cursive"
4444
ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep"
4545
ALL_LIBS+=" diskimage-builder os-vif python-brick-cinderclient-ext"
46-
ALL_LIBS+=" castellan"
46+
ALL_LIBS+=" castellan python-barbicanclient"
4747

4848
# Generate the above list with
4949
# echo ${!GITREPO[@]}

0 commit comments

Comments
 (0)