From: Manuel Franceschini <livewire@google.com>
Date: Fri, 3 Sep 2010 12:10:07 +0000 (+0200)
Subject: Log warning instead of raising OpExecError for ndisc6
X-Git-Tag: v2.3.0rc0~209
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/2dc1237cc392cc87a3c515897950e8eea96121d4

Log warning instead of raising OpExecError for ndisc6

Signed-off-by: Manuel Franceschini <livewire@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---

diff --git a/lib/backend.py b/lib/backend.py
index 2e9e34a..bdb4b00 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -306,7 +306,11 @@ def StartMaster(start_daemons, no_voting):
         utils.RunCmd(["arping", "-q", "-U", "-c 3", "-I", master_netdev, "-s",
                       master_ip, master_ip])
       elif ipcls == netutils.IP6Address:
-        utils.RunCmd(["ndisc6", "-q", "-r 3", master_ip, master_netdev])
+        try:
+          utils.RunCmd(["ndisc6", "-q", "-r 3", master_ip, master_netdev])
+        except errors.OpExecError:
+          # TODO: Better error reporting
+          logging.warning("Can't execute ndisc6, please install if missing")
 
   if err_msgs:
     _Fail("; ".join(err_msgs))