Blame SOURCES/bz1268801-Fixes-for-managing-special-cases-of-unmanaged-resour-2.patch

71541a
From ecef0b8d8be8f20225351b5af4448104937b2fea Mon Sep 17 00:00:00 2001
71541a
From: Chris Feist <cfeist@redhat.com>
71541a
Date: Wed, 7 Oct 2015 17:54:13 -0500
71541a
Subject: [PATCH] Remove all is-managed meta attributes when managing a
71541a
 resource
71541a
71541a
---
71541a
 pcs/resource.py | 2 +-
71541a
 1 file changed, 1 insertion(+), 1 deletion(-)
71541a
71541a
diff --git a/pcs/resource.py b/pcs/resource.py
71541a
index 7f2d4c3..c1c5f50 100644
71541a
--- a/pcs/resource.py
71541a
+++ b/pcs/resource.py
71541a
@@ -2351,7 +2351,7 @@ def resource_manage(argv, set_managed):
71541a
         else:
71541a
             # Remove the meta attribute from the id specified (and all children)
71541a
             xpath = "(//primitive|//group|//clone|//master)[@id='"+resource+"']//meta_attributes/nvpair[@name='is-managed']"
71541a
-            utils.run(["cibadmin", "-D", "--xpath", xpath])
71541a
+            utils.run(["cibadmin", "-d", "--xpath", xpath, "--force"])
71541a
             # Remove the meta attribute from the parent of the id specified, if the parent is a clone or master
71541a
             xpath = "(//master|//clone)[(group|primitive)[@id='"+resource+"']]/meta_attributes/nvpair[@name='is-managed']"
71541a
             utils.run(["cibadmin", "-D", "--xpath", xpath])
71541a
-- 
71541a
2.4.3
71541a