[PATCH 7/9] augeas: update the lense (rm amf & add update quorum options)

[Angus Salkeld <asalkeld@xxxxxxxxxx>]

Signed-off-by: Angus Salkeld <asalkeld@xxxxxxxxxx>
---
 conf/lenses/corosync.aug            |   15 +++++----------
 conf/lenses/tests/test_corosync.aug |   35 ++++++++++++++---------------------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/conf/lenses/corosync.aug b/conf/lenses/corosync.aug
index d3356a4..145b51a 100644
--- a/conf/lenses/corosync.aug
+++ b/conf/lenses/corosync.aug
@@ -140,21 +140,16 @@ let resources =
     system in
   section "resources" setting
 
-(* The amf section *)
-let amf =
-  let setting =
-   kv "mode" /enabled|disabled/ in
-  section "amf" setting
-
 (* The quorum section *)
 let quorum =
   let setting =
    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 "wait_for_all" Rx.integer
+   |kv "last_man_standing" Rx.integer
+   |kv "last_man_standing_window" Rx.integer
+   |kv "auto_tie_breaker" Rx.integer
    |kv "quorate" Rx.integer
    |kv "two_node" Rx.integer in
   section "quorum" setting
@@ -171,6 +166,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|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 6b73a7e..014236d 100644
--- a/conf/lenses/tests/test_corosync.aug
+++ b/conf/lenses/tests/test_corosync.aug
@@ -46,14 +46,14 @@ logging {
 }
 
 quorum {
-    provider: corosync_quorum_ykd
+    provider: corosync_votequorum
     expected_votes: 5
-    votes: 1
-    quorumdev_poll: 2
-    leaving_timeout: 2
-    disallowed: 0
-    quorate: 1
-    two_node: 0
+    votes: 2
+    two_node: 1
+    wait_for_all: 1
+    last_man_standing: 1
+    last_man_standing_window: 10000
+    auto_tie_breaker: 1
 }
 
 resources {
@@ -72,10 +72,6 @@ resources {
 uidgid {
     uid: 0
     gid: 0
-}
-
-amf {
-	mode: disabled
 }\n"
 
 test Corosync.lns get conf =
@@ -121,14 +117,14 @@ test Corosync.lns get conf =
 		{ "tags" = "enter|trace4" } } }
   { }
   { "quorum"
-    { "provider" = "corosync_quorum_ykd" }
+    { "provider" = "corosync_votequorum" }
     { "expected_votes" = "5" }
-    { "votes" = "1" }
-    { "quorumdev_poll" = "2" }
-    { "leaving_timeout" = "2" }
-    { "disallowed" = "0" }
-    { "quorate" = "1" }
-    { "two_node" = "0" } }
+    { "votes" = "2" }
+    { "two_node" = "1" }
+    { "wait_for_all" = "1" }
+    { "last_man_standing" = "1" }
+    { "last_man_standing_window" = "10000" }
+    { "auto_tie_breaker" = "1" } }
   { }
     { "resources"
 	  { "system"
@@ -142,6 +138,3 @@ test Corosync.lns get conf =
   { "uidgid"
     { "uid" = "0" }
     { "gid" = "0" } }
-  { }
-  { "amf"
-	{ "mode" = "disabled" } }
-- 
1.7.7.5

_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss