openstack/devstack
Code Issues Proposed changes

Merge "Add tooz support from Oslo"

Browse Source
This commit is contained in:
Jenkins 2014-12-10 00:02:13 +00:00 committed by Gerrit Code Review
commit 805887e4ee
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/oslo
View File

@ -36,6 +36,7 @@ GITDIR["oslo.vmware"]=$DEST/oslo.vmware
GITDIR["pycadf"]=$DEST/pycadf GITDIR["pycadf"]=$DEST/pycadf
GITDIR["stevedore"]=$DEST/stevedore GITDIR["stevedore"]=$DEST/stevedore
GITDIR["taskflow"]=$DEST/taskflow GITDIR["taskflow"]=$DEST/taskflow
GITDIR["tooz"]=$DEST/tooz
# Support entry points installation of console scripts # Support entry points installation of console scripts
OSLO_BIN_DIR=$(get_python_exec_prefix) OSLO_BIN_DIR=$(get_python_exec_prefix)
@ -69,6 +70,7 @@ function install_oslo {
_do_install_oslo_lib "pycadf" _do_install_oslo_lib "pycadf"
_do_install_oslo_lib "stevedore" _do_install_oslo_lib "stevedore"
_do_install_oslo_lib "taskflow" _do_install_oslo_lib "taskflow"
_do_install_oslo_lib "tooz"
} }
# Restore xtrace # Restore xtrace

4
stackrc
View File

@ -346,6 +346,10 @@ GITBRANCH["stevedore"]=${STEVEDORE_BRANCH:-master}
GITREPO["taskflow"]=${TASKFLOW_REPO:-${GIT_BASE}/openstack/taskflow.git} GITREPO["taskflow"]=${TASKFLOW_REPO:-${GIT_BASE}/openstack/taskflow.git}
GITBRANCH["taskflow"]=${TASKFLOW_BRANCH:-master} GITBRANCH["taskflow"]=${TASKFLOW_BRANCH:-master}
# tooz plugin manager
GITREPO["tooz"]=${TOOZ_REPO:-${GIT_BASE}/openstack/tooz.git}
GITBRANCH["tooz"]=${TOOZ_BRANCH:-master}
# pbr drives the setuptools configs # pbr drives the setuptools configs
GITREPO["pbr"]=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git} GITREPO["pbr"]=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git}
GITBRANCH["pbr"]=${PBR_BRANCH:-master} GITBRANCH["pbr"]=${PBR_BRANCH:-master}

2
tests/test_libs_from_pypi.sh
View File

@ -27,7 +27,7 @@ for i in $TOP/lib/*; do
fi fi
done done
ALL_LIBS="python-novaclient oslo.config pbr oslo.context python-troveclient python-keystoneclient taskflow oslo.middleware pycadf python-glanceclient python-ironicclient tempest-lib oslo.messaging oslo.log cliff python-heatclient stevedore python-cinderclient glance_store oslo.concurrency oslo.db oslo.vmware keystonemiddleware oslo.serialization python-saharaclient django_openstack_auth python-openstackclient oslo.rootwrap oslo.i18n python-ceilometerclient oslo.utils python-swiftclient python-neutronclient" ALL_LIBS="python-novaclient oslo.config pbr oslo.context python-troveclient python-keystoneclient taskflow oslo.middleware pycadf python-glanceclient python-ironicclient tempest-lib oslo.messaging oslo.log cliff python-heatclient stevedore python-cinderclient glance_store oslo.concurrency oslo.db oslo.vmware keystonemiddleware oslo.serialization python-saharaclient django_openstack_auth python-openstackclient oslo.rootwrap oslo.i18n python-ceilometerclient oslo.utils python-swiftclient python-neutronclient tooz"
# Generate the above list with # Generate the above list with
# echo ${!GITREPO[@]} # echo ${!GITREPO[@]}