Blame SOURCES/bz1176018-03-don-t-call-remove-guest-node-when-f-is-used.patch
|
|
f778fe |
From 1a2c01a82aa7e791a5d9925ec82792e764e53740 Mon Sep 17 00:00:00 2001
|
|
|
f778fe |
From: Ivan Devat <idevat@redhat.com>
|
|
|
f778fe |
Date: Wed, 31 May 2017 10:44:22 +0200
|
|
|
f778fe |
Subject: [PATCH] don't call remove guest node when -f is used
|
|
|
f778fe |
|
|
|
f778fe |
`pcs cluster node remove-guest` now does not call `crm_node --remove`
|
|
|
f778fe |
when -f is used
|
|
|
f778fe |
---
|
|
|
f778fe |
pcs/lib/commands/cluster.py | 5 +++--
|
|
|
f778fe |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
f778fe |
|
|
|
f778fe |
diff --git a/pcs/lib/commands/cluster.py b/pcs/lib/commands/cluster.py
|
|
|
f778fe |
index fe883f3..0b04d3d 100644
|
|
|
f778fe |
--- a/pcs/lib/commands/cluster.py
|
|
|
f778fe |
+++ b/pcs/lib/commands/cluster.py
|
|
|
f778fe |
@@ -464,8 +464,9 @@ def node_remove_guest(
|
|
|
f778fe |
env.push_cib(cib, wait)
|
|
|
f778fe |
|
|
|
f778fe |
#remove node from pcmk caches
|
|
|
f778fe |
- for node_addresses in node_addresses_list:
|
|
|
f778fe |
- remove_node(env.cmd_runner(), node_addresses.name)
|
|
|
f778fe |
+ if env.is_cib_live:
|
|
|
f778fe |
+ for node_addresses in node_addresses_list:
|
|
|
f778fe |
+ remove_node(env.cmd_runner(), node_addresses.name)
|
|
|
f778fe |
|
|
|
f778fe |
|
|
|
f778fe |
def node_clear(env, node_name, allow_clear_cluster_node=False):
|
|
|
f778fe |
--
|
|
|
f778fe |
1.8.3.1
|
|
|
f778fe |
|