a4dcfd9e5c
- Fixed 'pcs resource move' command - Fixed removing of unavailable fence-scsi storage device - Fixed ocf validation of ocf linbit drdb agent - Fixed creating empty cib - Updated pcs-web-ui
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From e58f7897d561cff2f9c257933acdb36d57cc130c Mon Sep 17 00:00:00 2001
|
|
From: Tomas Jelinek <tojeline@redhat.com>
|
|
Date: Tue, 4 Jan 2022 12:56:56 +0100
|
|
Subject: [PATCH 2/4] Make ocf:linbit:drbd agent pass OCF validation
|
|
|
|
---
|
|
data/ocf-1.0.rng | 18 ++++++++----------
|
|
1 file changed, 8 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/data/ocf-1.0.rng b/data/ocf-1.0.rng
|
|
index 36ba4611..1e14a83b 100644
|
|
--- a/data/ocf-1.0.rng
|
|
+++ b/data/ocf-1.0.rng
|
|
@@ -169,16 +169,14 @@ RNGs. Thank you.
|
|
<optional>
|
|
<element name="content">
|
|
<choice>
|
|
- <attribute name="type">
|
|
- <choice>
|
|
- <value>boolean</value>
|
|
- <value>string</value>
|
|
- <value>integer</value>
|
|
- <value>second</value><!-- used by fence agents -->
|
|
- <value>int</value><!-- used by fence agents intead of integer -->
|
|
- <value>time</value><!-- used by pacemaker metadata -->
|
|
- </choice>
|
|
- </attribute>
|
|
+ <!--
|
|
+ OCF 1.0 allows values: boolean, integer, string. Agents, however,
|
|
+ quite often use other values: int (fence agents), numeric
|
|
+ (ocf:linbit:drbd), second (fence agents), time (pacemaker
|
|
+ metadata). Since pcs doesn't actually care about the type, we
|
|
+ allow any type to keep compatibility with existing agents.
|
|
+ -->
|
|
+ <attribute name="type" />
|
|
<group>
|
|
<!--
|
|
used by fence agents and processed by pcs even though it is not
|
|
--
|
|
2.31.1
|
|
|