From: yayogev <yaronyogev@gmail.com>
Date: Mon, 4 Sep 2017 13:04:47 +0000 (+0300)
Subject: restart_service(): ignore non-Error in CentOs
X-Git-Tag: opnfv-5.1.RC1~37
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1745ff341283720042c829254a76bb060e671027;p=calipso.git

restart_service(): ignore non-Error in CentOs

When doing 'service X restart' in CentOs it says:
'Error: Redirecting to /bin/systemctl restart'
But it's not really an error but more of an info message

Change-Id: I03e66aa872e9b3f4fd85d579207d9dcc6494eb8c
Signed-off-by: yayogev <yaronyogev@gmail.com>
---

diff --git a/app/monitoring/setup/monitoring_handler.py b/app/monitoring/setup/monitoring_handler.py
index 7a95a3a..903b8d8 100644
--- a/app/monitoring/setup/monitoring_handler.py
+++ b/app/monitoring/setup/monitoring_handler.py
@@ -385,8 +385,9 @@ class MonitoringHandler(MongoAccess, CliAccess, BinaryConverter):
                 ssh.exec(cmd)
             else:
                 self.run(cmd, ssh_to_host=host, ssh=ssh)
-        except SshError:
-            self.had_errors = True
+        except SshError as e:
+            if 'Error: Redirecting to /bin/systemctl restart' not in str(e):
+                self.had_errors = True
 
     def deploy_config_to_target(self, host_details):
         try: