Merge "Remove bin/ scripts support from in-tree devstack plugin"

This commit is contained in:
Jenkins 2015-07-09 14:52:35 +00:00 committed by Gerrit Code Review
commit f86d633f94

View File

@ -22,12 +22,7 @@ SAHARA_AUTH_CACHE_DIR=${SAHARA_AUTH_CACHE_DIR:-/var/cache/sahara}
SAHARA_ENABLED_PLUGINS=${SAHARA_ENABLED_PLUGINS:-vanilla,hdp,cdh,mapr,spark,storm,fake} SAHARA_ENABLED_PLUGINS=${SAHARA_ENABLED_PLUGINS:-vanilla,hdp,cdh,mapr,spark,storm,fake}
# Support entry points installation of console scripts SAHARA_BIN_DIR=$(get_python_exec_prefix)
if [[ -d $SAHARA_DIR/bin ]]; then
SAHARA_BIN_DIR=$SAHARA_DIR/bin
else
SAHARA_BIN_DIR=$(get_python_exec_prefix)
fi
# Tell Tempest this project is present # Tell Tempest this project is present
TEMPEST_SERVICES+=,sahara TEMPEST_SERVICES+=,sahara