openstack/barbican
Code Issues Proposed changes

Fix barbican devstack plugin for devstack systemd

Browse Source 
Devstack moved to using systemd instead of screen by default[1],
but the barbican devstack plugin starts uwsgi without a full path.
This patch fixes that.

[1] https://review.openstack.org/#/c/460062/

Change-Id: Ib12cc9ac5b7f2acbb94ccca1baf4200c47fc275f
This commit is contained in:
Michael Johnson 2017-05-01 16:57:24 -07:00
parent c6e289e0e7
commit e0af278f9e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/barbican
View File

@ -186,7 +186,7 @@ function install_barbicanclient {
# start_barbican - Start running processes, including screen
function start_barbican {
# Start the Barbican service up.
run_process barbican-svc "uwsgi --master --emperor $BARBICAN_CONF_DIR/vassals"
run_process barbican-svc "$BARBICAN_BIN_DIR/uwsgi --master --emperor $BARBICAN_CONF_DIR/vassals"
# Pause while the barbican-svc populates the database, otherwise the retry
# service below might try to do this at the same time, leading to race
@ -423,7 +423,7 @@ function configure_pykmip {
# start_pykmip - start the PyKMIP server
function start_pykmip {
run_process pykmip-server "pykmip-server -f ${PYKMIP_CONF} -l ${PYKMIP_LOG_DIR}/pykmip-devstack.log"
run_process pykmip-server "$BARBICAN_BIN_DIR/pykmip-server -f ${PYKMIP_CONF} -l ${PYKMIP_LOG_DIR}/pykmip-devstack.log"
}
# Dogtag functions

2
devstack/upgrade/upgrade.sh
View File

@ -66,6 +66,6 @@ upgrade_project barbican $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH
$BARBICAN_BIN_DIR/barbican-manage db upgrade -v head || die $LINENO "DB sync error"
# Start the Barbican service up.
run_process barbican-svc "uwsgi --master --emperor $BARBICAN_CONF_DIR/vassals"
run_process barbican-svc "$BARBICAN_BIN_DIR/uwsgi --master --emperor $BARBICAN_CONF_DIR/vassals"
sleep 10
run_process barbican-retry "$BARBICAN_BIN_DIR/barbican-retry --config-file=$BARBICAN_CONF_DIR/barbican.conf"