|
 |
e4ffb1 |
From 0aacfcf209c473ab4c1fff4de653a673b92484de Mon Sep 17 00:00:00 2001
|
|
|
e4ffb1 |
From: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
e4ffb1 |
Date: Wed, 19 Aug 2015 09:55:06 +0200
|
|
|
e4ffb1 |
Subject: [PATCH] fence_virsh: Add --missing-as-off option
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
Resolves: rhbz#1254821
|
|
|
e4ffb1 |
---
|
|
|
e4ffb1 |
fence/agents/virsh/fence_virsh.py | 4 +++-
|
|
|
e4ffb1 |
tests/data/metadata/fence_virsh.xml | 5 +++++
|
|
|
e4ffb1 |
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py
|
|
|
e4ffb1 |
index 0a94136..24d360c 100644
|
|
|
e4ffb1 |
--- a/fence/agents/virsh/fence_virsh.py
|
|
|
e4ffb1 |
+++ b/fence/agents/virsh/fence_virsh.py
|
|
|
e4ffb1 |
@@ -54,6 +54,8 @@ def get_power_status(conn, options):
|
|
|
e4ffb1 |
for line in conn.before.splitlines():
|
|
|
e4ffb1 |
if line.strip() in ["running", "blocked", "idle", "no state", "paused"]:
|
|
|
e4ffb1 |
return "on"
|
|
|
e4ffb1 |
+ if "error: failed to get domain" in line.strip() and options.has_key("missing_as_off"):
|
|
|
e4ffb1 |
+ return "off"
|
|
|
e4ffb1 |
if "error:" in line.strip():
|
|
|
e4ffb1 |
fail_usage("Failed: You have to enter existing name/UUID of virtual machine!")
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
@@ -68,7 +70,7 @@ def set_power_status(conn, options):
|
|
|
e4ffb1 |
time.sleep(int(options["--power-wait"]))
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
def main():
|
|
|
e4ffb1 |
- device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", "port", "sudo"]
|
|
|
e4ffb1 |
+ device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", "port", "sudo", "missing_as_off"]
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
atexit.register(atexit_handler)
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
diff --git a/tests/data/metadata/fence_virsh.xml b/tests/data/metadata/fence_virsh.xml
|
|
|
e4ffb1 |
index 642c72e..d664fc4 100644
|
|
|
e4ffb1 |
--- a/tests/data/metadata/fence_virsh.xml
|
|
|
e4ffb1 |
+++ b/tests/data/metadata/fence_virsh.xml
|
|
|
e4ffb1 |
@@ -105,6 +105,11 @@ By default, virsh needs root account to do properly work. So you must allow ssh
|
|
|
e4ffb1 |
<content type="string" default="5" />
|
|
|
e4ffb1 |
<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
+ <parameter name="missing_as_off" unique="0" required="0">
|
|
|
e4ffb1 |
+ <getopt mixed="--missing-as-off" />
|
|
|
e4ffb1 |
+ <content type="boolean" />
|
|
|
e4ffb1 |
+ <shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
|
|
|
e4ffb1 |
+ </parameter>
|
|
|
e4ffb1 |
<parameter name="power_timeout" unique="0" required="0">
|
|
|
e4ffb1 |
<getopt mixed="--power-timeout=[seconds]" />
|
|
|
e4ffb1 |
<content type="string" default="20" />
|