From 6b2eb3b99ae16bbb9daa5f515cc6c2abe10c543d Mon Sep 17 00:00:00 2001
From: Pall Helgason <palli@greenqloud.com>
Date: Tue, 8 Dec 2015 13:28:08 +0000
Subject: [PATCH] CLOUDSTACK-9645: Moving stop of management in config inside
 if statement.

It will only run the stop command when --no-start is specified.
---
 python/lib/cloudutils/serviceConfigServer.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
index dce85a028e4..377552f0e14 100644
--- a/python/lib/cloudutils/serviceConfigServer.py
+++ b/python/lib/cloudutils/serviceConfigServer.py
@@ -137,9 +137,8 @@ class cloudManagementConfig(serviceCfgBase):
         except:
             pass
 
-        self.syscfg.svo.stopService("cloudstack-management")
-
         if self.syscfg.env.noStart == False:
+            self.syscfg.svo.stopService("cloudstack-management")
             if self.syscfg.svo.enableService("cloudstack-management"):
                 return True
             else: