Attachment 937931 Details for Bug 886232 – proposed fix

[patch] proposed fix

0001-Add-warning-when-no-stonith-resource-agents-availabl.patch (text/plain), 1.85 KB, created by Tomas Jelinek on 2014-09-16 11:12:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Jelinek

Created: 2014-09-16 11:12:12 UTC

Size: 1.85 KB

patch

obsolete

>From 49c669ef8e1841297f2e2027e26edf692e5529ef Mon Sep 17 00:00:00 2001
>From: Tomas Jelinek <tojeline@redhat.com>
>Date: Tue, 16 Sep 2014 12:35:23 +0200
>Subject: [PATCH] Add warning when no stonith/resource agents available
>
>---
> pcs/resource.py |  9 +++++++++
> pcs/stonith.py  | 13 +++++++++----
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
>diff --git a/pcs/resource.py b/pcs/resource.py
>index b113b71..90d7fe0 100644
>--- a/pcs/resource.py
>+++ b/pcs/resource.py
>@@ -222,11 +222,20 @@ def resource_list_available(argv):
>         if match:
>             ret += "systemd:" + match.group(1) + "\n"
> 
>+    if not ret:
>+        utils.err(
>+            "No resource agents available. "
>+            "Do you have resource agents installed?"
>+        )
>     if filter_string != "":
>         rlines = ret.split("\n")
>+        found = False
>         for rline in rlines:
>             if rline.lower().find(filter_string.lower()) != -1:
>                 print rline
>+                found = True
>+        if not found:
>+            utils.err("No resource agents matching the filter.")
>     else:
>         print ret,
> 
>diff --git a/pcs/stonith.py b/pcs/stonith.py
>index cd3e74e..c667f7d 100644
>--- a/pcs/stonith.py
>+++ b/pcs/stonith.py
>@@ -107,10 +107,15 @@ def stonith_list_available(argv):
>         except ValueError:
>             continue
> 
>-    for fd in fence_devices:
>-        if fd.count(filter_string) == 0:
>-            continue
>-
>+    if not fence_devices:
>+        utils.err(
>+            "No stonith agents available. Do you have fence agents installed?"
>+        )
>+    fence_devices_filtered = [fd for fd in fence_devices if filter_string in fd]
>+    if not fence_devices_filtered:
>+        utils.err("No stonith agents matching the filter.")
>+
>+    for fd in fence_devices_filtered:
>         sd = ""
>         fd_name = fd[10:]
>         if not "--nodesc" in utils.pcs_options:
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 886232: 937931