File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -31,6 +31,7 @@ set +o pipefail
3131
3232# Set up default directories
3333GITDIR[" python-ironicclient" ]=$DEST /python-ironicclient
34+ GITDIR[" ironic-lib" ]=$DEST /ironic-lib
3435
3536IRONIC_DIR=$DEST /ironic
3637IRONIC_PYTHON_AGENT_DIR=$DEST /ironic-python-agent
@@ -191,6 +192,12 @@ function install_ironic {
191192 die $LINENO " $srv should be enabled for Ironic."
192193 fi
193194 done
195+
196+ if use_library_from_git " ironic-lib" ; then
197+ git_clone_by_name " ironic-lib"
198+ setup_dev_lib " ironic-lib"
199+ fi
200+
194201 git_clone $IRONIC_REPO $IRONIC_DIR $IRONIC_BRANCH
195202 setup_develop $IRONIC_DIR
196203
Original file line number Diff line number Diff line change @@ -455,6 +455,10 @@ GITBRANCH["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_BRANCH:-master}
455455GITREPO[" os-brick" ]=${OS_BRICK_REPO:- ${GIT_BASE} / openstack/ os-brick.git}
456456GITBRANCH[" os-brick" ]=${OS_BRICK_BRANCH:- master}
457457
458+ # ironic common lib
459+ GITREPO[" ironic-lib" ]=${IRONIC_LIB_REPO:- ${GIT_BASE} / openstack/ ironic-lib.git}
460+ GITBRANCH[" ironic-lib" ]=${IRONIC_LIB_BRANCH:- master}
461+
458462
459463# #################
460464#
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient"
4141ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
4242ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
4343ALL_LIBS+=" oslo.cache oslo.reports"
44- ALL_LIBS+=" keystoneauth"
44+ ALL_LIBS+=" keystoneauth ironic-lib "
4545
4646# Generate the above list with
4747# echo ${!GITREPO[@]}
You can’t perform that action at this time.
0 commit comments