|
 |
caa933 |
From a75e1456f11725b7a58bc81148a6d6403b2530d2 Mon Sep 17 00:00:00 2001
|
|
|
caa933 |
From: Jan Pokorný <jpokorny@redhat.com>
|
|
|
caa933 |
Date: Dec 01 2017 10:47:51 +0000
|
|
|
caa933 |
Subject: formats/corosync.rng: support nodelist.node.name configuration option
|
|
|
caa933 |
|
|
|
caa933 |
|
|
|
caa933 |
This option within corosync configuration was silently established (and
|
|
|
caa933 |
suggested to overcome certain node identification issues) by pacemaker
|
|
|
caa933 |
without any awareness within the former, and hence was completely
|
|
|
caa933 |
foreign also to a detached attempt to formalize this public config,
|
|
|
caa933 |
interface (known as "corosync.conf" file) by the means of RelaxNG
|
|
|
caa933 |
schema describing its XML equivalent and materialized as an in-tree
|
|
|
caa933 |
corosync.rng file. This used to be prone to validation issues with the
|
|
|
caa933 |
cib2pcscmd* commands, but since corosync now acknowledges that option
|
|
|
caa933 |
just as any other native one[*], set the schema to follow suit.
|
|
|
caa933 |
|
|
|
caa933 |
[*] https://github.com/corosync/corosync/pull/286
|
|
|
caa933 |
|
|
|
caa933 |
Resolves: <https://bugzilla.redhat.com/1517834>
|
|
|
caa933 |
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
|
|
|
caa933 |
|
|
|
caa933 |
---
|
|
|
caa933 |
|
|
|
caa933 |
diff --git a/formats/corosync/corosync.rng b/formats/corosync/corosync.rng
|
|
|
caa933 |
index 7b12652..f239da8 100644
|
|
|
caa933 |
--- a/formats/corosync/corosync.rng
|
|
|
caa933 |
+++ b/formats/corosync/corosync.rng
|
|
|
caa933 |
@@ -376,6 +376,19 @@ adjust nodes in the cluster.</a:documentation>
|
|
|
caa933 |
<element name="node">
|
|
|
caa933 |
<group>
|
|
|
caa933 |
<optional>
|
|
|
caa933 |
+ <attribute name="name">
|
|
|
caa933 |
+ <a:documentation>This optional configuration option
|
|
|
caa933 |
+provides a unified way for the client software (e.g. pacemaker) atop,
|
|
|
caa933 |
+respectively the end users, to guide establishing a nominal
|
|
|
caa933 |
+(self-)identification for each node in case neither respective
|
|
|
caa933 |
+*ringX_addr* specifies a network hostname nor other means are
|
|
|
caa933 |
+available/effective in this process. Option is not used by Corosync
|
|
|
caa933 |
+itself.</a:documentation>
|
|
|
caa933 |
+
|
|
|
caa933 |
+ <text/>
|
|
|
caa933 |
+ </attribute>
|
|
|
caa933 |
+ </optional>
|
|
|
caa933 |
+ <optional>
|
|
|
caa933 |
<attribute name="nodeid">
|
|
|
caa933 |
<a:documentation>This configuration option is optional when
|
|
|
caa933 |
using IPv4 and required when using IPv6. This is a 32bit value
|
|
|
caa933 |
@@ -395,8 +408,10 @@ is reserved and should not be used.</a:documentation>
|
|
|
caa933 |
</attribute>
|
|
|
caa933 |
</optional>
|
|
|
caa933 |
<attribute name="ring0_addr">
|
|
|
caa933 |
- <a:documentation>This specifies IP address of one of the nodes for particular ring
|
|
|
caa933 |
-as denoted by its number (instead 0, there can be higher numbers).</a:documentation>
|
|
|
caa933 |
+ <a:documentation>This specifies IP or network hostname
|
|
|
caa933 |
+address of the particular node for particular link as denoted by its
|
|
|
caa933 |
+number (there can be higher numbers instead of 0 that marks the first
|
|
|
caa933 |
+link).</a:documentation>
|
|
|
caa933 |
|
|
|
caa933 |
<text/>
|
|
|
caa933 |
</attribute>
|
|
|
caa933 |
|