From e6cdf3ec8dba4ca0b125807def8da40d0c8179fb Mon Sep 17 00:00:00 2001 From: zhurong Date: Tue, 16 Jun 2020 09:23:07 +0800 Subject: [PATCH] Use uwsgi binary from path and docs job fix 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 --- bindep.txt | 7 +++++++ devstack/lib/cyborg | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bindep.txt b/bindep.txt index 23c98213..3b4d86d2 100644 --- a/bindep.txt +++ b/bindep.txt @@ -3,3 +3,10 @@ # Required for running the 'lspci' command 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] diff --git a/devstack/lib/cyborg b/devstack/lib/cyborg index fed7b9bc..3da7a8ca 100644 --- a/devstack/lib/cyborg +++ b/devstack/lib/cyborg @@ -264,7 +264,7 @@ function start_cyborg { # Starts Cyborg API server. function start_cyborg_api { 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 run_process cyborg-api "$CYBORG_BIN_DIR/cyborg-api --config-file $CYBORG_CONF_FILE" fi