From fbcabd2c03985000bd9b4d4d9a4478bc0b784efa Mon Sep 17 00:00:00 2001
From: Douglas Viroel <viroel@gmail.com>
Date: Tue, 16 Jun 2020 09:15:58 -0300
Subject: [PATCH] Fix uwsgi path location

After fixing the uwsgi installation from source that was broken[1][2],
Manila jobs started to fail since no uwsgi wasn't found in the
expected path. This fix now uses 'which' command to search for
uwsgi pathnames in the system.

[1] https://bugs.launchpad.net/devstack/+bug/1883468
[2] https://review.opendev.org/#/c/577955/

Related-Bug: #1883468
Closes-Bug: #1883715
Change-Id: I8d8b2fe07d86899c694cb73a81087d25311d30a5
---
 devstack/plugin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index de58505f5b..98c467bc8e 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -829,7 +829,7 @@ function start_manila_api {
 
     if [ $(trueorfalse False MANILA_USE_UWSGI) == True ]; then
         echo "Deploying with UWSGI"
-        run_process m-api "$MANILA_BIN_DIR/uwsgi --ini $MANILA_UWSGI_CONF --procname-prefix manila-api"
+        run_process m-api "$(which uwsgi) --ini $MANILA_UWSGI_CONF --procname-prefix manila-api"
     elif [ $(trueorfalse False MANILA_USE_MOD_WSGI) == True ]; then
         echo "Deploying with MOD_WSGI"
         install_apache_wsgi