Signed-off-by: Angus Salkeld <[email protected]>
---
conf/lenses/corosync.aug | 12 +++++++++---
conf/lenses/tests/test_corosync.aug | 26 +++++++++++++++++++-------
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/conf/lenses/corosync.aug b/conf/lenses/corosync.aug
index f3257e9..46a474b 100644
--- a/conf/lenses/corosync.aug
+++ b/conf/lenses/corosync.aug
@@ -38,12 +38,18 @@ let qstr (k:regexp) =
let compatibility = kv "compatibility" /whitetank|none/
+let member =
+ let setting =
+ qstr /memberaddr/ in
+ section "member" setting
+
(* A integer subsection *)
let interface =
let setting =
kv "ringnumber" Rx.integer
|kv "mcastport" Rx.integer
- |qstr /bindnetaddr|mcastaddr/ in
+ |qstr /bindnetaddr|mcastaddr/
+ |member in
section "interface" setting
(* The totem section *)
@@ -55,7 +61,7 @@ let totem =
|kv "secauth" /on|off/
|kv "crypto_type" /nss|sober/
|kv "crypto_accept" /new|old/
- |kv "transport" /udp|iba/
+ |kv "transport" /udp|iba|udpu/
|kv "version" Rx.integer
|kv "nodeid" Rx.integer
|kv "threads" Rx.integer
@@ -170,6 +176,6 @@ let uidgid =
qstr /uid|gid/ in
section "uidgid" setting
-let lns =
(comment|empty|compatibility|totem|quorum|logging|resources|amf|service|uidgid)*
+let lns =
(comment|empty|compatibility|totem|quorum|logging|resources|amf|service|uidgid|member)*
let xfm = transform lns (incl "/etc/corosync/corosync.conf")
diff --git a/conf/lenses/tests/test_corosync.aug
b/conf/lenses/tests/test_corosync.aug
index a0fe1d5..b396fca 100644
--- a/conf/lenses/tests/test_corosync.aug
+++ b/conf/lenses/tests/test_corosync.aug
@@ -6,19 +6,26 @@ compatibility: whitetank
totem {
version: 2
secauth: off
- crypto_type: nss
- crypto_accept: new
+ crypto_type: nss
+ crypto_accept: new
threads: 0
- clear_node_high_bit: no
- rrp_mode: none
- transport: udp
- token: 1000
+ clear_node_high_bit: no
+ rrp_mode: none
+ transport: udp
+ token: 1000
interface {
ringnumber: 0
bindnetaddr: 192.168.122.1
mcastaddr: 226.94.1.1
mcastport: 5405
+ member {
+ memberaddr: 10.16.35.101
+ }
+ member {
+ memberaddr: 10.16.35.102
+ }
}
+ transport: udpu
}
logging {
@@ -95,7 +102,12 @@ test Corosync.lns get conf =
{ "ringnumber" = "0" }
{ "bindnetaddr" = "192.168.122.1" }
{ "mcastaddr" = "226.94.1.1" }
- { "mcastport" = "5405" } } }
+ { "mcastport" = "5405" }
+ { "member"
+ { "memberaddr" = "10.16.35.101" } }
+ { "member"
+ { "memberaddr" = "10.16.35.102" } } }
+ { "transport" = "udpu" } }
{ }
{ "logging"
{ "fileline" = "off" }
--
1.7.3.1
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
