bug 11458: stop cgconfig before start libvirtd, "service cgconfig status" returns "Running" instead of "running", then cloud-setup-agent doesn't stop it

edisonSu · edisonSu · commit fd759c60dfa5 · 2011-09-15T14:38:04.000-07:00
status 11458: resolved fixed
diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
@@ -296,14 +296,14 @@ def config(self):
                         }\n"
             cfo.add_lines(addConfig)
 
-            self.syscfg.svo.stopService("cgconfig")
+            self.syscfg.svo.stopService("cgconfig", True)
             self.syscfg.svo.enableService("cgconfig",forcestart=True)
 
             cfo = configFileOps("/etc/cgrules.conf", self)
             cfgline = "root:/usr/sbin/libvirtd  cpu virt/\n"
             cfo.add_lines(cfgline)
             
-            self.syscfg.svo.stopService("cgred")
+            self.syscfg.svo.stopService("cgred", True)
             if not self.syscfg.svo.enableService("cgred"):
                 return False
             return True
diff --git a/python/lib/cloudutils/utilities.py b/python/lib/cloudutils/utilities.py
@@ -120,7 +120,7 @@ class serviceOpsRedhat(serviceOps):
     def isServiceRunning(self, servicename):
         try:
             o = bash("service " + servicename + " status")
-            if "running" in o.getStdout() or "start" in o.getStdout():
+            if "running" in o.getStdout() or "start" in o.getStdout() or "Running" in o.getStdout():
                 return True
             else:
                 return False
