openstack
/
gnocchi
Code Issues Proposed changes

Merge "gate: work with old and new devstack ceph plugin"

This commit is contained in:
Jenkins 2016-05-11 08:05:20 +00:00 committed by Gerrit Code Review
parent 2343d101dc c2d722b185
commit b78a8542b9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/gate/gate_hook.sh
View File

@ -41,7 +41,10 @@ case $STORAGE_DRIVER in
DEVSTACK_GATE_TEMPEST+=$'\nexport SWIFT_USE_MOD_WSGI=True'
;;
ceph)
ENABLED_SERVICES+="ceph"
if [ "${PROJECTS//devstack-plugin-ceph/}" == "$PROJECTS" ]; then
# Old fashion ceph plugin
ENABLED_SERVICES+="ceph"
fi
DEVSTACK_LOCAL_CONFIG+=$'\nexport GNOCCHI_STORAGE_BACKEND=ceph'
;;
esac