[cloudstack] branch 4.13 updated: cloudutils: `service is-active` output check for "failed" (#3574)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.13 by this push:
     new 2496e53  cloudutils: `service is-active` output check for "failed" 
(#3574)
2496e53 is described below

commit 2496e53bbb217535267796c105a4450c79663764
Author: dahn <daan.hoogl...@shapeblue.com>
AuthorDate: Tue Sep 10 18:33:42 2019 +0200

    cloudutils: `service is-active` output check for "failed" (#3574)
    
    Small change to check for the right output of the system call.
    
    Fixes: #3572
---
 python/lib/cloudutils/utilities.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/lib/cloudutils/utilities.py 
b/python/lib/cloudutils/utilities.py
index 6fbc582..2a7043d 100755
--- a/python/lib/cloudutils/utilities.py
+++ b/python/lib/cloudutils/utilities.py
@@ -217,7 +217,8 @@ class serviceOpsRedhat7(serviceOps):
     def isServiceRunning(self, servicename):
         try:
             o = bash("systemctl is-active " + servicename)
-            return "inactive" not in o.getStdout()
+            textout = o.getStdout()
+            return "inactive" not in textout and "failed" not in textout
         except:
             return False