good for commit after this changeset, make sure make distcheck works :)
thanks -steve On Tue, 2010-03-30 at 13:32 +1100, Angus Salkeld wrote: > Signed-off-by: Angus Salkeld <[email protected]> > --- > Makefile.am | 2 +- > conf/lenses/corosync.aug | 18 +++++++++++++++--- > conf/lenses/tests/test_corosync.aug | 23 ++++++++++++++++++++++- > 3 files changed, 38 insertions(+), 5 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 852b496..6d42f61 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -34,7 +34,7 @@ SPEC = $(PACKAGE_NAME).spec > TARFILE = $(PACKAGE_NAME)-$(VERSION).tar.gz > > EXTRA_DIST = autogen.sh conf/corosync.conf.example $(SPEC).in \ > - conf/lenses/tests/test_corosync.aug > + conf/lenses/tests/test_corosync.aug > conf/lenses/corosync.aug > > AUTOMAKE_OPTIONS = foreign > > diff --git a/conf/lenses/corosync.aug b/conf/lenses/corosync.aug > index e9eff2b..a94e689 100644 > --- a/conf/lenses/corosync.aug > +++ b/conf/lenses/corosync.aug > @@ -119,15 +119,27 @@ 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 quorum section *) > +(* The service section *) > let service = > let setting = > 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 20ad6f0..bae7db6 100644 > --- 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" } } _______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
