Support installing ironic-lib
ironic-lib will soon become a dependency of ironic, make sure we can write dsvm gates against it. Change-Id: I6e66ae770cf5065980848e7e987bfd75765a5ac6
This commit is contained in:
parent
32e0febbc0
commit
869b72b851
@ -31,6 +31,7 @@ set +o pipefail
|
||||
|
||||
# Set up default directories
|
||||
GITDIR["python-ironicclient"]=$DEST/python-ironicclient
|
||||
GITDIR["ironic-lib"]=$DEST/ironic-lib
|
||||
|
||||
IRONIC_DIR=$DEST/ironic
|
||||
IRONIC_PYTHON_AGENT_DIR=$DEST/ironic-python-agent
|
||||
@ -191,6 +192,12 @@ function install_ironic {
|
||||
die $LINENO "$srv should be enabled for Ironic."
|
||||
fi
|
||||
done
|
||||
|
||||
if use_library_from_git "ironic-lib"; then
|
||||
git_clone_by_name "ironic-lib"
|
||||
setup_dev_lib "ironic-lib"
|
||||
fi
|
||||
|
||||
git_clone $IRONIC_REPO $IRONIC_DIR $IRONIC_BRANCH
|
||||
setup_develop $IRONIC_DIR
|
||||
|
||||
|
4
stackrc
4
stackrc
@ -455,6 +455,10 @@ GITBRANCH["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_BRANCH:-master}
|
||||
GITREPO["os-brick"]=${OS_BRICK_REPO:-${GIT_BASE}/openstack/os-brick.git}
|
||||
GITBRANCH["os-brick"]=${OS_BRICK_BRANCH:-master}
|
||||
|
||||
# ironic common lib
|
||||
GITREPO["ironic-lib"]=${IRONIC_LIB_REPO:-${GIT_BASE}/openstack/ironic-lib.git}
|
||||
GITBRANCH["ironic-lib"]=${IRONIC_LIB_BRANCH:-master}
|
||||
|
||||
|
||||
##################
|
||||
#
|
||||
|
@ -41,7 +41,7 @@ ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient"
|
||||
ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
|
||||
ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
|
||||
ALL_LIBS+=" oslo.cache oslo.reports"
|
||||
ALL_LIBS+=" keystoneauth"
|
||||
ALL_LIBS+=" keystoneauth ironic-lib"
|
||||
|
||||
# Generate the above list with
|
||||
# echo ${!GITREPO[@]}
|
||||
|
Loading…
Reference in New Issue
Block a user