|
 |
55aad9 |
From a703fba575b965c843ec527621fdd5009425be35 Mon Sep 17 00:00:00 2001
|
|
|
55aad9 |
From: "Fabio M. Di Nitto" <fdinitto@redhat.com>
|
|
|
55aad9 |
Date: Sat, 20 Jun 2015 11:43:09 +0200
|
|
|
55aad9 |
Subject: [PATCH 2/3] fence_compute: resync with master and drop unnecessary
|
|
|
55aad9 |
workaround
|
|
|
55aad9 |
|
|
|
55aad9 |
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
|
|
|
55aad9 |
---
|
|
|
55aad9 |
fence/agents/compute/fence_compute.py | 23 -----------------------
|
|
|
55aad9 |
1 file changed, 23 deletions(-)
|
|
|
55aad9 |
|
|
|
55aad9 |
diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
|
|
|
55aad9 |
index d8a1e95..82d9c46 100644
|
|
|
55aad9 |
--- a/fence/agents/compute/fence_compute.py
|
|
|
55aad9 |
+++ b/fence/agents/compute/fence_compute.py
|
|
|
55aad9 |
@@ -233,29 +233,6 @@ def main():
|
|
|
55aad9 |
options["--auth-url"],
|
|
|
55aad9 |
endpoint_type=options["--endpoint-type"])
|
|
|
55aad9 |
|
|
|
55aad9 |
- if options["--action"] in ["on", "off", "reboot" ]:
|
|
|
55aad9 |
- try:
|
|
|
55aad9 |
- nova.services.list(host=options["--plug"])
|
|
|
55aad9 |
- except ConnectionError as (err):
|
|
|
55aad9 |
- # Yes, exit(0)
|
|
|
55aad9 |
- #
|
|
|
55aad9 |
- # Its possible that the control plane on which this
|
|
|
55aad9 |
- # agent depends is not functional
|
|
|
55aad9 |
- #
|
|
|
55aad9 |
- # In this situation, fencing is waiting for resource
|
|
|
55aad9 |
- # recovery and resource recovery is waiting for
|
|
|
55aad9 |
- # fencing.
|
|
|
55aad9 |
- #
|
|
|
55aad9 |
- # To break the cycle, we all the fencing agent to
|
|
|
55aad9 |
- # return 'done' immediately so that we can recover the
|
|
|
55aad9 |
- # control plane. We then rely on the NovaCompute RA
|
|
|
55aad9 |
- # to call this agent directly once the control plane
|
|
|
55aad9 |
- # is up.
|
|
|
55aad9 |
- #
|
|
|
55aad9 |
- # Yes its horrible, but still better than nova itself.
|
|
|
55aad9 |
- logging.warning("Nova connection failed: %s " % str(err))
|
|
|
55aad9 |
- sys.exit(0)
|
|
|
55aad9 |
-
|
|
|
55aad9 |
if options["--action"] in ["off", "reboot"]:
|
|
|
55aad9 |
# Pretend we're 'on' so that the fencing library will always call set_power_status(off)
|
|
|
55aad9 |
override_status = "on"
|
|
|
55aad9 |
--
|
|
|
55aad9 |
1.9.3
|
|
|
55aad9 |
|