Correctly generate cluster.conf for a two-node cluster.

svn path=/trunk/packages/invirt-cluster-config/; revision=2023

diff --git a/cluster.conf.mako b/cluster.conf.mako
index 44b1541..806e92d 100644 (file)
--- a/cluster.conf.mako
+++ b/cluster.conf.mako
@@ -3,7 +3,11 @@ from invirt.config import structs as cfg
 %>\
 <?xml version="1.0"?>
 <cluster name="invirt" config_version="1">
 %>\
 <?xml version="1.0"?>
 <cluster name="invirt" config_version="1">

+% if len(cfg.hosts) == 2:
+  <cman two_node="1" expected_votes="1" />
+% else:

   <cman />
   <cman />

+% endif

   <clusternodes>
 % for id, host in enumerate(cfg.hosts):
     <clusternode name="${host.hostname.split('.')[0]}-internal" nodeid="${id + 1}" />
   <clusternodes>
 % for id, host in enumerate(cfg.hosts):
     <clusternode name="${host.hostname.split('.')[0]}-internal" nodeid="${id + 1}" />

diff --git a/debian/changelog b/debian/changelog
index 1c7595c..b5b0e13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-cluster-config (0.0.9) unstable; urgency=low
+
+  * Correctly generate cluster.conf for a two-node cluster.
+
+ -- Evan Broder <broder@mit.edu>  Fri, 30 Jan 2009 05:46:04 -0500
+

 invirt-cluster-config (0.0.8) unstable; urgency=low
 
   * Add Provides and Conflicts lines to debian/control for
 invirt-cluster-config (0.0.8) unstable; urgency=low
 
   * Add Provides and Conflicts lines to debian/control for