diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 1725064b0..a75086c08 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -20,7 +20,7 @@ if is_service_enabled barbican; then if [[ "$1" == "stack" && "$2" == "install" ]]; then echo_summary "Installing Barbican" - install_barbican + stack_install_service barbican install_barbicanclient if is_service_enabled barbican-pykmip; then echo_summary "Installing PyKMIP" diff --git a/devstack/settings b/devstack/settings index 0487e3eff..7e664735a 100644 --- a/devstack/settings +++ b/devstack/settings @@ -14,9 +14,13 @@ PYKMIP_CONF_DIR=${PYKMIP_CONF_DIR:-/etc/pykmip} PYKMIP_CONF=${PYKMIP_CONF_DIR}/server.conf PYKMIP_LOG_DIR=${PYKMIP_LOG_DIR:-/var/log/pykmip} -# Support potential entry-points console scripts -BARBICAN_BIN_DIR=$(get_python_exec_prefix) - +# Barbican virtual environment +if [[ ${USE_VENV} = True ]]; then + PROJECT_VENV["barbican"]=${BARBICAN_DIR}.venv + BARBICAN_BIN_DIR=${PROJECT_VENV["barbican"]}/bin +else + BARBICAN_BIN_DIR=$(get_python_exec_prefix) +fi # WSGI variables BARBICAN_WSGI=$BARBICAN_BIN_DIR/barbican-wsgi-api BARBICAN_UWSGI_CONF=$BARBICAN_CONF_DIR/barbican-uwsgi.ini