openstack/devstack
Code Issues Proposed changes

Merge "Allow installing etcd3gw from source"

Browse Source
This commit is contained in:
Zuul
2025-08-18 20:23:08 +00:00
committed by Gerrit Code Review
parent 1a74605eb4 a8aecbad4f
commit d755acf0a4
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libraries
View File

@@ -27,6 +27,7 @@ GITDIR["castellan"]=$DEST/castellan
GITDIR["cliff"]=$DEST/cliff GITDIR["cliff"]=$DEST/cliff
GITDIR["cursive"]=$DEST/cursive GITDIR["cursive"]=$DEST/cursive
GITDIR["debtcollector"]=$DEST/debtcollector GITDIR["debtcollector"]=$DEST/debtcollector
GITDIR["etcd3gw"]=$DEST/etcd3gw
GITDIR["futurist"]=$DEST/futurist GITDIR["futurist"]=$DEST/futurist
GITDIR["openstacksdk"]=$DEST/openstacksdk GITDIR["openstacksdk"]=$DEST/openstacksdk
GITDIR["os-client-config"]=$DEST/os-client-config GITDIR["os-client-config"]=$DEST/os-client-config
@@ -131,8 +132,12 @@ function install_libs {
# python client libraries we might need from git can go here # python client libraries we might need from git can go here
_install_lib_from_source "python-barbicanclient" _install_lib_from_source "python-barbicanclient"
if use_library_from_git etcd3gw ; then
_install_lib_from_source "etcd3gw"
else
# etcd (because tooz does not have a hard dependency on these) # etcd (because tooz does not have a hard dependency on these)
pip_install etcd3gw pip_install etcd3gw
fi
} }
# Restore xtrace # Restore xtrace

4
stackrc
View File

@@ -395,6 +395,10 @@ GITBRANCH["futurist"]=${FUTURIST_BRANCH:-$TARGET_BRANCH}
GITREPO["debtcollector"]=${DEBTCOLLECTOR_REPO:-${GIT_BASE}/openstack/debtcollector.git} GITREPO["debtcollector"]=${DEBTCOLLECTOR_REPO:-${GIT_BASE}/openstack/debtcollector.git}
GITBRANCH["debtcollector"]=${DEBTCOLLECTOR_BRANCH:-$TARGET_BRANCH} GITBRANCH["debtcollector"]=${DEBTCOLLECTOR_BRANCH:-$TARGET_BRANCH}
# etcd3gw library
GITREPO["etcd3gw"]=${ETCD3GW_REPO:-${GIT_BASE}/openstack/etcd3gw.git}
GITBRANCH["etcd3gw"]=${ETCD3GW_BRANCH:-$BRANCHLESS_TARGET_BRANCH}
# helpful state machines # helpful state machines
GITREPO["automaton"]=${AUTOMATON_REPO:-${GIT_BASE}/openstack/automaton.git} GITREPO["automaton"]=${AUTOMATON_REPO:-${GIT_BASE}/openstack/automaton.git}
GITBRANCH["automaton"]=${AUTOMATON_BRANCH:-$TARGET_BRANCH} GITBRANCH["automaton"]=${AUTOMATON_BRANCH:-$TARGET_BRANCH}

2
tests/test_libs_from_pypi.sh
View File

@@ -45,7 +45,7 @@ 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 os-resource-classes" ALL_LIBS+=" castellan python-barbicanclient ovsdbapp os-ken os-resource-classes"
ALL_LIBS+=" oslo.limit" ALL_LIBS+=" oslo.limit etcd3gw"
# Generate the above list with # Generate the above list with
# echo ${!GITREPO[@]} # echo ${!GITREPO[@]}