projects
/
ganeti-local
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3794937
)
Log warning instead of raising OpExecError for ndisc6
author
Manuel Franceschini
<livewire@google.com>
Fri, 3 Sep 2010 12:10:07 +0000
(14:10 +0200)
committer
Manuel Franceschini
<livewire@google.com>
Fri, 3 Sep 2010 15:02:36 +0000
(17:02 +0200)
Signed-off-by: Manuel Franceschini <livewire@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
lib/backend.py
patch
|
blob
|
history
diff --git
a/lib/backend.py
b/lib/backend.py
index
2e9e34a
..
bdb4b00
100644
(file)
--- 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))