openstack/cyborg
Code Issues Proposed changes

Use uwsgi binary from path and docs job fix

Browse Source 
All these uwsgi invocations assume that the uwsgi binary is in the
same directory as their project binaries are installed into (probably
/usr/bin).  That may not be correct -- for example if using a packaged
uwsgi on Fedora the binary will live in /usr/sbin/uwsgi (not /usr/bin
where the project files from pip are).

Switch invocations to just find it in the path.
Also fix the docs job

Change-Id: Ib56b4d3f4962466ea9e937b314e54014070e7adc
This commit is contained in:
zhurong 2020-06-16 09:23:07 +08:00
parent eef6ddd62d
commit e6cdf3ec8d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bindep.txt
View File

@ -3,3 +3,10 @@
# Required for running the 'lspci' command # Required for running the 'lspci' command
pciutils pciutils
# libsrvg2 is needed for sphinxcontrib-svg2pdfconverter in docs builds.
librsvg2-tools [doc platform:rpm]
librsvg2-bin [doc platform:dpkg]
latexmk [pdf-docs]
fonts-freefont-otf [pdf-docs]
texlive-xetex [pdf-docs]

2
devstack/lib/cyborg
View File

@ -264,7 +264,7 @@ function start_cyborg {
# Starts Cyborg API server. # Starts Cyborg API server.
function start_cyborg_api { function start_cyborg_api {
if [ "$CYBORG_USE_UWSGI" == "True" ]; then if [ "$CYBORG_USE_UWSGI" == "True" ]; then
run_process cyborg-api "$CYBORG_BIN_DIR/uwsgi --ini $CYBORG_UWSGI_CONF --procname-prefix cyborg-api" run_process cyborg-api "$(which uwsgi) --ini $CYBORG_UWSGI_CONF --procname-prefix cyborg-api"
else else
run_process cyborg-api "$CYBORG_BIN_DIR/cyborg-api --config-file $CYBORG_CONF_FILE" run_process cyborg-api "$CYBORG_BIN_DIR/cyborg-api --config-file $CYBORG_CONF_FILE"
fi fi