Index: trunk/packages/invirt-cluster-config/cluster.conf.mako
===================================================================
--- trunk/packages/invirt-cluster-config/cluster.conf.mako	(revision 2926)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<%
-from invirt.config import structs as cfg
-%>\
-<?xml version="1.0"?>
-<cluster name="invirt" config_version="2">
-% if len(cfg.hosts) == 2:
-  <cman two_node="1" expected_votes="1" />
-% else:
-  <cman />
-% endif
-  <clusternodes>
-% for id, host in enumerate(cfg.hosts):
-    <clusternode name="${host.hostname.split('.')[0]}-internal" nodeid="${id + 1}">
-      <fence>
-        <method name="single">
-          <device name="human" nodename="${host.hostname.split('.')[0]}-internal"/>
-        </method>
-      </fence>
-    </clusternode>
-% endfor
-  </clusternodes>
-  <fencedevices>
-    <fencedevice name="human" agent="fence_manual"/>
-  </fencedevices>
-</cluster>
Index: trunk/packages/invirt-cluster-config/debian/changelog
===================================================================
--- trunk/packages/invirt-cluster-config/debian/changelog	(revision 2926)
+++ trunk/packages/invirt-cluster-config/debian/changelog	(revision 2927)
@@ -3,6 +3,7 @@
   * Use LVM's built-in cluster locking instead of a separate locking
     library - this is the behavior prefered by modern LVM.
+  * Use openais for clustering instead of cman!
 
- -- Evan Broder <broder@mit.edu>  Tue, 26 Jan 2010 20:33:32 -0500
+ -- Evan Broder <broder@mit.edu>  Tue, 26 Jan 2010 21:14:14 -0500
 
 invirt-cluster-config (0.0.11) unstable; urgency=low
Index: trunk/packages/invirt-cluster-config/debian/control
===================================================================
--- trunk/packages/invirt-cluster-config/debian/control	(revision 2926)
+++ trunk/packages/invirt-cluster-config/debian/control	(revision 2927)
@@ -9,8 +9,8 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base,
- cman, clvm
+ corosync, invirt-openais | openais (>> 1.1.2), clvm
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
 Description: Cluster configuration for the Invirt project
  This package should be installed on all Invirt host machines to
- configure Redhat Clustering and clustering LVM
+ configure OpenAIS clustering and clustering LVM
Index: trunk/packages/invirt-cluster-config/debian/corosync.conf.invirt.mako
===================================================================
--- trunk/packages/invirt-cluster-config/debian/corosync.conf.invirt.mako	(revision 2927)
+++ trunk/packages/invirt-cluster-config/debian/corosync.conf.invirt.mako	(revision 2927)
@@ -0,0 +1,33 @@
+<%
+from invirt.config import structs as cfg
+ring = 0
+%>\
+compatibility: whitetank
+
+totem {
+	version: 2
+	secauth: off
+% if len(cfg.cluster.rings) > 1:
+	rrp_mode: passive
+% endif
+% for r in cfg.cluster.rings:
+	interface {
+		ringnumber: ${ring}
+		bindnetaddr: ${r.bind}
+		mcastaddr: ${r.mcast}
+		mcastport: ${r.port}
+	}
+<% ring += 1 %>\
+% endfor
+}
+
+logging {
+	to_syslog: yes
+	syslog_facility: daemon
+	timestamp: on
+	debug: off
+}
+
+amf {
+	mode: disabled
+}
Index: trunk/packages/invirt-cluster-config/debian/corosync.invirt
===================================================================
--- trunk/packages/invirt-cluster-config/debian/corosync.invirt	(revision 2927)
+++ trunk/packages/invirt-cluster-config/debian/corosync.invirt	(revision 2927)
@@ -0,0 +1,5 @@
+# start corosync at boot [yes|no]
+START=yes
+
+# Use openais's clustering instead of corosync
+export COROSYNC_DEFAULT_CONFIG_IFACE="openaisserviceenableexperimental:corosync_parser"
Index: trunk/packages/invirt-cluster-config/debian/invirt-cluster-config.install
===================================================================
--- trunk/packages/invirt-cluster-config/debian/invirt-cluster-config.install	(revision 2926)
+++ trunk/packages/invirt-cluster-config/debian/invirt-cluster-config.install	(revision 2927)
@@ -1,1 +1,2 @@
-cluster.conf.mako etc/cluster
+debian/corosync.conf.invirt.mako etc/corosync
+debian/corosync.invirt etc/default
Index: trunk/packages/invirt-cluster-config/debian/rules
===================================================================
--- trunk/packages/invirt-cluster-config/debian/rules	(revision 2926)
+++ trunk/packages/invirt-cluster-config/debian/rules	(revision 2927)
@@ -4,4 +4,7 @@
 DEB_TRANSFORM_FILES_invirt-cluster-config += \
 	/etc/lvm/lvm.conf.invirt
+DEB_DIVERT_FILES_invirt-cluster-config += \
+	/etc/corosync/corosync.conf.invirt \
+	/etc/default/corosync
 
 include /usr/share/cdbs/1/rules/debhelper.mk