augeas: add uidgid and quorum options to lense

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2749 fd59a12c-fef9-0310-b244-a6a79926bd2f

diff --git a/conf/lenses/corosync.aug b/conf/lenses/corosync.aug
index abeccfa14854e7425910095a2730de98533d98c7..a94e6892fe35e93d6e82f28c3286151696feae5e 100644 (file)
--- a/conf/lenses/corosync.aug
+++ b/conf/lenses/corosync.aug
@@ -119,7 +119,13 @@ let amf =
 (* The quorum section *)
 let quorum =
   let setting =
-   qstr /provider/ in
+   qstr /provider/
+   |kv "expected_votes" Rx.integer
+   |kv "votes" Rx.integer
+   |kv "quorumdev_poll" Rx.integer
+   |kv "leaving_timeout" Rx.integer
+   |kv "disallowed" Rx.integer
+   |kv "two_node" Rx.integer in
   section "quorum" setting
 
 (* The service section *)
@@ -128,6 +134,12 @@ let service =
    qstr /name|ver/ in
   section "service" setting
 
-let lns = (comment|empty|compatibility|totem|quorum|logging|amf|service)*
+(* The uidgid section *)
+let uidgid =
+  let setting =
+   qstr /uid|gid/ in
+  section "uidgid" setting
+
+let lns = (comment|empty|compatibility|totem|quorum|logging|amf|service|uidgid)*
 
 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 20ad6f0da5db67d9bc2a2013ef6f9ba0fbb5fdfc..bae7db6501d73fbfe36cf9a8999dbdd80fc93316 100644 (file)
--- a/conf/lenses/tests/test_corosync.aug
+++ b/conf/lenses/tests/test_corosync.aug
@@ -45,6 +45,17 @@ logging {
 
 quorum {
     provider: corosync_quorum_ykd
+    expected_votes: 5
+    votes: 1
+    quorumdev_poll: 2
+    leaving_timeout: 2
+    disallowed: 0
+    two_node: 0
+}
+
+uidgid {
+    uid: 0
+    gid: 0
 }
 
 amf {
@@ -92,7 +103,17 @@ test Corosync.lns get conf =
                { "debug" = "on" } } }
   { }
   { "quorum"
-    { "provider" = "corosync_quorum_ykd" } }
+    { "provider" = "corosync_quorum_ykd" }
+    { "expected_votes" = "5" }
+    { "votes" = "1" }
+    { "quorumdev_poll" = "2" }
+    { "leaving_timeout" = "2" }
+    { "disallowed" = "0" }
+    { "two_node" = "0" } }
+  { }
+  { "uidgid"
+    { "uid" = "0" }
+    { "gid" = "0" } }
   { }
   { "amf"
        { "mode" = "disabled" } }