From 34cef2f4e17e5899d025cac08de1cd6b88afe0e7 Mon Sep 17 00:00:00 2001
From: Eyal <eyal.bar-ilan@nokia.com>
Date: Mon, 15 Jun 2020 15:04:55 +0300
Subject: [PATCH] Don't install uwsgi in vitrage

* It is installed in stack.sh
* get the path to uwsgi executable from which command
it is not necessarily installed in /usr/local/bin

Depends-On: https://review.opendev.org/#/c/735592/
Change-Id: I126e210b8028bb2e63d85143f97fd24994879d69
---
 devstack/plugin.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a5c2b8430..875bdb6db 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -272,8 +272,6 @@ function install_vitrage {
 
     if [[ "$VITRAGE_DEPLOY" == "mod_wsgi" ]]; then
         install_apache_wsgi
-    elif [[ "$VITRAGE_DEPLOY" == "uwsgi" ]]; then
-        pip_install uwsgi
     fi
 }
 
@@ -294,7 +292,7 @@ function start_vitrage {
         enable_apache_site vitrage
         restart_apache_server
     elif [[ "$VITRAGE_DEPLOY" == "uwsgi" ]]; then
-        run_process vitrage-api "$VITRAGE_BIN_DIR/uwsgi --procname-prefix vitrage --ini $VITRAGE_UWSGI_FILE" ""
+        run_process vitrage-api "$(which uwsgi) --procname-prefix vitrage --ini $VITRAGE_UWSGI_FILE" ""
     else
         run_process vitrage-api "$VITRAGE_BIN_DIR/vitrage-api -d -v --config-file $VITRAGE_CONF"
     fi