From 673952f0240ac6484ecafeddb5502f68646485db Mon Sep 17 00:00:00 2001
From: Chad Roberts <croberts@redhat.com>
Date: Tue, 1 Dec 2015 11:59:29 -0500
Subject: [PATCH] Explicitly calling start for sahara-api in sahara-all

Now calling launch_api_service and service.start() for
sahara-api when launching sahara-all to get the
api server to start, even in debug mode.

Change-Id: I8668a70b99e3f1fba98ec9df783b7962b9632037
Closes-Bug: #1521266
---
 sahara/cli/sahara_all.py | 4 ++--
 sahara/main.py           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sahara/cli/sahara_all.py b/sahara/cli/sahara_all.py
index 42546c3f..8196e0f4 100644
--- a/sahara/cli/sahara_all.py
+++ b/sahara/cli/sahara_all.py
@@ -58,5 +58,5 @@ def main():
     server.setup_auth_policy()
 
     launcher = server.get_process_launcher()
-    launcher.launch_service(server.SaharaWSGIService("sahara-all", app))
-    launcher.wait()
+    server.launch_api_service(
+        launcher, server.SaharaWSGIService("sahara-all", app))
diff --git a/sahara/main.py b/sahara/main.py
index 1ea41f91..3bbcdaef 100644
--- a/sahara/main.py
+++ b/sahara/main.py
@@ -157,4 +157,5 @@ def get_process_launcher():
 
 def launch_api_service(launcher, service):
     launcher.launch_service(service, workers=CONF.api_workers)
+    service.start()
     launcher.wait()