From 96aa80acc445e93803699f32da4c23c377a22484 Mon Sep 17 00:00:00 2001
From: Dan Smith <dansmith@redhat.com>
Date: Tue, 25 Feb 2020 07:35:44 -0800
Subject: [PATCH] Always stop cyborg-api process uwsgi container

Right now, devstack/clean.sh always leaves an orphaned cyborg-api
service running. This makes us always stop it to avoid that.

Change-Id: I1c40804a7b20d54da3c09e613597c388e9f330f7
---
 devstack/lib/cyborg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/devstack/lib/cyborg b/devstack/lib/cyborg
index 65078dd3..fed7b9bc 100644
--- a/devstack/lib/cyborg
+++ b/devstack/lib/cyborg
@@ -287,9 +287,8 @@ function stop_cyborg {
     if [ "$CYBORG_USE_UWSGI" == "True" ]; then
         disable_apache_site cyborg-api
         restart_apache_server
-    else
-        stop_process cyborg-api
     fi
+    stop_process cyborg-api
     stop_process cyborg-cond
     stop_process cyborg-agent
 }