Fix pacemaker property name validation - added cib

pcs/prop.py

@@ -98,8 +98,13 @@ def get_default_properties():
         utils.err("unable to get crmd metadata\n"+output)
     crmd_root = ET.fromstring(output)
 
+    (output, retVal) = utils.run([settings.cib_binary, "metadata"])
+    if retVal != 0:
+        utils.err("unable to get cib metadata\n"+output)
+    cib_root = ET.fromstring(output)
+
     parameters = {}
-    for root in [pe_root, crmd_root]:
+    for root in [pe_root, crmd_root, cib_root]:
         for param in root.getiterator('parameter'):
             name = param.attrib["name"]
             content = param.find("content")

pcs/settings.py

@@ -5,6 +5,7 @@
 fence_agent_binaries = "/usr/sbin/"
 pengine_binary = "/usr/libexec/pacemaker/pengine"
 crmd_binary = "/usr/libexec/pacemaker/crmd"
+cib_binary = "/usr/libexec/pacemaker/cib"
 stonithd_binary = "/usr/libexec/pacemaker/stonithd"
 pcs_version = "0.9.127"
 crm_report = pacemaker_binaries + "crm_report"

pcs/utils.py

@@ -1212,6 +1212,16 @@ def is_valid_property(prop):
         if p.getAttribute("name") == prop:
             return True
 
+    output, retval = run([settings.cib_binary, "metadata"])
+    if retval != 0:
+        err("unable to run cib\n" + output)
+
+    dom = parseString(output)
+    properties = dom.getElementsByTagName("parameter");
+    for p in properties:
+        if p.getAttribute("name") == prop:
+            return True
+
     return False
 
 def get_node_attributes():