good for merge On Thu, 2010-03-18 at 08:59 +1100, Angus Salkeld wrote: > This is so I can configure the crypto options using augeas > > -Angus > > Signed-off-by: Angus Salkeld <[email protected]> > --- > Makefile.am | 11 +++++++++++ > conf/lenses/corosync.aug | 2 ++ > conf/lenses/tests/test_corosync.aug | 4 ++++ > 3 files changed, 17 insertions(+), 0 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index a55a50f..380ce32 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -71,6 +71,17 @@ uninstall-local: > rmdir $(DESTDIR)/${localstatedir}/lib/corosync || :; > rmdir $(DESTDIR)/${SOCKETDIR} || :; > > + > +check_SCRIPTS = test_lense.sh > +TESTS = $(check_SCRIPTS) > + > +test_lense.sh: > + echo "augparse -I $(srcdir)/conf/lenses/ > $(srcdir)/conf/lenses/tests/test_corosync.aug" > $@ > + chmod +x $@ > + > +CLEANFILES = test_lense.sh > + > + > lint: > for dir in lcr lib exec services tools test; do make -C $$dir lint; done > > diff --git a/conf/lenses/corosync.aug b/conf/lenses/corosync.aug > index a7ff421..aef16ed 100644 > --- a/conf/lenses/corosync.aug > +++ b/conf/lenses/corosync.aug > @@ -53,6 +53,8 @@ let totem = > |kv "rrp_mode" /none|active|passive/ > |kv "vsftype" /none|ykd/ > |kv "secauth" /on|off/ > + |kv "crypto_type" /nss|sober/ > + |kv "crypto_accept" /new|old/ > |kv "transport" /udp|iba/ > |kv "version" Rx.integer > |kv "nodeid" Rx.integer > diff --git a/conf/lenses/tests/test_corosync.aug > b/conf/lenses/tests/test_corosync.aug > index 0bf3277..ecaac4c 100644 > --- a/conf/lenses/tests/test_corosync.aug > +++ b/conf/lenses/tests/test_corosync.aug > @@ -6,6 +6,8 @@ compatibility: whitetank > totem { > version: 2 > secauth: off > + crypto_type: nss > + crypto_accept: new > threads: 0 > clear_node_high_bit: no > rrp_mode: none > @@ -53,6 +55,8 @@ test Corosync.lns get conf = > { "totem" > { "version" = "2" } > { "secauth" = "off" } > + { "crypto_type" = "nss" } > + { "crypto_accept" = "new" } > { "threads" = "0" } > { "clear_node_high_bit" = "no" } > { "rrp_mode" = "none" }
_______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
