openstack
/
devstack
Code Issues Proposed changes

Merge "Allow install os-vif library used by Nova"

This commit is contained in:
Jenkins 2016-03-24 15:22:31 +00:00 committed by Gerrit Code Review
parent 22314596af 1258da6408
commit 547c393b93
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nova
View File

@ -34,6 +34,7 @@ set +o xtrace
# Set up default directories
GITDIR["python-novaclient"]=$DEST/python-novaclient
GITDIR["os-vif"]=$DEST/os-vif
NOVA_DIR=$DEST/nova
# Nova virtual environment
@ -728,6 +729,13 @@ function install_novaclient {
# install_nova() - Collect source and prepare
function install_nova {
# Install os-vif
if use_library_from_git "os-vif"; then
git_clone_by_name "os-vif"
setup_dev_lib "os-vif"
fi
if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then
install_nova_hypervisor
fi

4
stackrc
View File

@ -484,6 +484,10 @@ GITDIR["ceilometermiddleware"]=$DEST/ceilometermiddleware
GITREPO["os-brick"]=${OS_BRICK_REPO:-${GIT_BASE}/openstack/os-brick.git}
GITBRANCH["os-brick"]=${OS_BRICK_BRANCH:-master}
# os-vif library to communicate between Neutron to Nova
GITREPO["os-vif"]=${OS_VIF_REPO:-${GIT_BASE}/openstack/os-vif.git}
GITBRANCH["os-vif"]=${OS_VIF_BRANCH:-master}
# ironic common lib
GITREPO["ironic-lib"]=${IRONIC_LIB_REPO:-${GIT_BASE}/openstack/ironic-lib.git}
GITBRANCH["ironic-lib"]=${IRONIC_LIB_BRANCH:-master}

2
tests/test_libs_from_pypi.sh
View File

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