openstack/barbican
Code Issues Proposed changes

Merge "Add venv support to the devstack plugin"

Browse Source
This commit is contained in:
Zuul 2019-03-07 07:40:59 +00:00 committed by Gerrit Code Review
commit 9499e27c22
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -20,7 +20,7 @@ if is_service_enabled barbican; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing Barbican" echo_summary "Installing Barbican"
install_barbican stack_install_service barbican
install_barbicanclient install_barbicanclient
if is_service_enabled barbican-pykmip; then if is_service_enabled barbican-pykmip; then
echo_summary "Installing PyKMIP" echo_summary "Installing PyKMIP"

10
devstack/settings
View File

@ -14,9 +14,13 @@ PYKMIP_CONF_DIR=${PYKMIP_CONF_DIR:-/etc/pykmip}
PYKMIP_CONF=${PYKMIP_CONF_DIR}/server.conf PYKMIP_CONF=${PYKMIP_CONF_DIR}/server.conf
PYKMIP_LOG_DIR=${PYKMIP_LOG_DIR:-/var/log/pykmip} PYKMIP_LOG_DIR=${PYKMIP_LOG_DIR:-/var/log/pykmip}
# Support potential entry-points console scripts # Barbican virtual environment
BARBICAN_BIN_DIR=$(get_python_exec_prefix) 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 # WSGI variables
BARBICAN_WSGI=$BARBICAN_BIN_DIR/barbican-wsgi-api BARBICAN_WSGI=$BARBICAN_BIN_DIR/barbican-wsgi-api
BARBICAN_UWSGI_CONF=$BARBICAN_CONF_DIR/barbican-uwsgi.ini BARBICAN_UWSGI_CONF=$BARBICAN_CONF_DIR/barbican-uwsgi.ini