Attachment 900308 Details for Bug 1081243 – [3/3] proposed fix

[patch] [3/3] proposed fix

0003-Pass-xml-to-cibadmin-using-pipe-instead-of-stdin.patch (text/plain), 1.39 KB, created by Tomas Jelinek on 2014-05-29 09:47:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Jelinek

Created: 2014-05-29 09:47:41 UTC

Size: 1.39 KB

patch

obsolete

>From e3e75864eff1785d100b4f4eaf7d01976b39c091 Mon Sep 17 00:00:00 2001
>From: Tomas Jelinek <tojeline@redhat.com>
>Date: Thu, 29 May 2014 11:14:07 +0200
>Subject: [PATCH 3/3] Pass xml to cibadmin using pipe instead of stdin
>
>* replace remaining 'cibadmin --xml-text' with
>  utils.replace_cib_configuration
>* remove unused function utils.add_to_cib
>---
> pcs/utils.py | 13 +------------
> 1 file changed, 1 insertion(+), 12 deletions(-)
>
>diff --git a/pcs/utils.py b/pcs/utils.py
>index 18b3cd5..295b31b 100644
>--- a/pcs/utils.py
>+++ b/pcs/utils.py
>@@ -838,13 +838,6 @@ def get_cib_xpath(xpath_query):
>         return ""
>     return output
> 
>-# Create an object in the cib
>-# Returns output, retval
>-def add_to_cib(scope, xml):
>-    args = ["cibadmin"]
>-    args = args  + ["-o", scope, "-C", "-X", xml]
>-    return run(args)
>-
> def remove_from_cib(xml):
>     args = ["cibadmin"]
>     args = args + ["-D", "-X", xml]
>@@ -1136,11 +1129,7 @@ def set_cib_property(prop, value):
>     elif not property_found and "--force" not in pcs_options:
>         err("can't remove property: '%s' that doesn't exist" % (prop))
> 
>-
>-    args = ["cibadmin", "-c", "-R", "--xml-text", crm_config.toxml()]
>-    output, retVal = run(args)
>-    if output != "":
>-        print output
>+    replace_cib_configuration(crm_config)
> 
> def setAttribute(a_type, a_name, a_value):
>     args = ["crm_attribute", "--type", a_type, "--attr-name", a_name,
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 1081243: 900306 | 900307 | 900308 | 900309 | 961677