openstack/devstack
Code Issues Proposed changes

Merge "Add castellan to LIBS_FROM_GIT"

Browse Source
This commit is contained in:
Jenkins 2017-04-19 12:33:06 +00:00 committed by Gerrit Code Review
commit 0cfc523ff7
3 changed files with 7 additions and 0 deletions

2
lib/oslo

@ -23,6 +23,7 @@ set +o xtrace
# Defaults # Defaults
# -------- # --------
GITDIR["automaton"]=$DEST/automaton GITDIR["automaton"]=$DEST/automaton
GITDIR["castellan"]=$DEST/castellan
GITDIR["cliff"]=$DEST/cliff GITDIR["cliff"]=$DEST/cliff
GITDIR["debtcollector"]=$DEST/debtcollector GITDIR["debtcollector"]=$DEST/debtcollector
GITDIR["futurist"]=$DEST/futurist GITDIR["futurist"]=$DEST/futurist
@ -71,6 +72,7 @@ function _do_install_oslo_lib {
# install_oslo() - Collect source and prepare # install_oslo() - Collect source and prepare
function install_oslo { function install_oslo {
_do_install_oslo_lib "automaton" _do_install_oslo_lib "automaton"
_do_install_oslo_lib "castellan"
_do_install_oslo_lib "cliff" _do_install_oslo_lib "cliff"
_do_install_oslo_lib "debtcollector" _do_install_oslo_lib "debtcollector"
_do_install_oslo_lib "futurist" _do_install_oslo_lib "futurist"

4
stackrc

@ -370,6 +370,10 @@ GITDIR["python-openstackclient"]=$DEST/python-openstackclient
# #
################### ###################
# castellan key manager interface
GITREPO["castellan"]=${CASTELLAN_REPO:-${GIT_BASE}/openstack/castellan.git}
GITBRANCH["castellan"]=${CASTELLAN_BRANCH:-master}
# cliff command line framework # cliff command line framework
GITREPO["cliff"]=${CLIFF_REPO:-${GIT_BASE}/openstack/cliff.git} GITREPO["cliff"]=${CLIFF_REPO:-${GIT_BASE}/openstack/cliff.git}
GITBRANCH["cliff"]=${CLIFF_BRANCH:-master} GITBRANCH["cliff"]=${CLIFF_BRANCH:-master}

1
tests/test_libs_from_pypi.sh

@ -43,6 +43,7 @@ ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
ALL_LIBS+=" oslo.cache oslo.reports osprofiler" ALL_LIBS+=" oslo.cache oslo.reports osprofiler"
ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep" ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep"
ALL_LIBS+=" diskimage-builder os-vif python-brick-cinderclient-ext" ALL_LIBS+=" diskimage-builder os-vif python-brick-cinderclient-ext"
ALL_LIBS+=" castellan"
# Generate the above list with # Generate the above list with
# echo ${!GITREPO[@]} # echo ${!GITREPO[@]}