openstack/devstack
Code Issues Proposed changes

Merge "Allow to install os-resource-classes from git repo"

Browse Source
This commit is contained in:
Zuul 2021-08-10 06:57:20 +00:00 committed by Gerrit Code Review
commit 971dfbf8a0
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libraries Normal file → Executable file
View File

@ -59,6 +59,7 @@ GITDIR["tooz"]=$DEST/tooz
# Non oslo libraries are welcomed below as well, this prevents # Non oslo libraries are welcomed below as well, this prevents
# duplication of this code. # duplication of this code.
GITDIR["os-brick"]=$DEST/os-brick GITDIR["os-brick"]=$DEST/os-brick
GITDIR["os-resource-classes"]=$DEST/os-resource-classes
GITDIR["os-traits"]=$DEST/os-traits GITDIR["os-traits"]=$DEST/os-traits
# Support entry points installation of console scripts # Support entry points installation of console scripts
@ -122,6 +123,7 @@ function install_libs {
# #
# os-traits for nova # os-traits for nova
_install_lib_from_source "os-brick" _install_lib_from_source "os-brick"
_install_lib_from_source "os-resource-classes"
_install_lib_from_source "os-traits" _install_lib_from_source "os-traits"
# #
# python client libraries we might need from git can go here # python client libraries we might need from git can go here

4
stackrc Normal file → Executable file
View File

@ -548,6 +548,10 @@ GITREPO["neutron-lib"]=${NEUTRON_LIB_REPO:-${GIT_BASE}/openstack/neutron-lib.git
GITBRANCH["neutron-lib"]=${NEUTRON_LIB_BRANCH:-$TARGET_BRANCH} GITBRANCH["neutron-lib"]=${NEUTRON_LIB_BRANCH:-$TARGET_BRANCH}
GITDIR["neutron-lib"]=$DEST/neutron-lib GITDIR["neutron-lib"]=$DEST/neutron-lib
# os-resource-classes library containing a list of standardized resource classes for OpenStack
GITREPO["os-resource-classes"]=${OS_RESOURCE_CLASSES_REPO=:-${GIT_BASE}/openstack/os-resource-classes.git}
GITBRANCH["os-resource-classes"]=${OS_RESOURCE_CLASSES_BRANCH:-$TARGET_BRANCH}
# os-traits library for resource provider traits in the placement service # os-traits library for resource provider traits in the placement service
GITREPO["os-traits"]=${OS_TRAITS_REPO:-${GIT_BASE}/openstack/os-traits.git} GITREPO["os-traits"]=${OS_TRAITS_REPO:-${GIT_BASE}/openstack/os-traits.git}
GITBRANCH["os-traits"]=${OS_TRAITS_BRANCH:-$TARGET_BRANCH} GITBRANCH["os-traits"]=${OS_TRAITS_BRANCH:-$TARGET_BRANCH}

2
tests/test_libs_from_pypi.sh
View File

@ -44,7 +44,7 @@ ALL_LIBS+=" debtcollector os-brick os-traits automaton futurist oslo.service"
ALL_LIBS+=" oslo.cache oslo.reports osprofiler cursive" ALL_LIBS+=" oslo.cache oslo.reports osprofiler cursive"
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 python-barbicanclient ovsdbapp os-ken" ALL_LIBS+=" castellan python-barbicanclient ovsdbapp os-ken os-resource-classes"
# Generate the above list with # Generate the above list with
# echo ${!GITREPO[@]} # echo ${!GITREPO[@]}