clarify a few things

diff --git a/input/howto/install-ganeti.creole b/input/howto/install-ganeti.creole
index 85f1476..47ead83 100644 (file)
--- a/input/howto/install-ganeti.creole
+++ b/input/howto/install-ganeti.creole
@@ -48,6 +48,7 @@ On each node, ensure that the required kernel modules are loaded at boot:
     ainsl /etc/modules 'drbd minor_count=255 usermode_helper=/bin/true'
     ainsl /etc/modules 'hmac'
     ainsl /etc/modules 'tun'
+    ainsl /etc/modules 'ext3'
 }}}
 
 === configure networking ===
@@ -63,9 +64,9 @@ should be configured rather than eth1.
 To prevent the link address changing due to startup/shutdown of virtual
 machines, explicitly set the value.
 
-{{{
-    # /etc/networking/interfaces for foo.debian.org
+This is the interfaces file for foo.debian.org:
 
+{{{
     auto br0
     iface br0 inet static
       bridge_ports eth0
@@ -82,9 +83,9 @@ machines, explicitly set the value.
       netmask 255.255.255.0
 }}}
 
-{{{
-    # /etc/networking/interfaces for bar.debian.org
+This is the interfaces file for bar.debian.org:
 
+{{{
     auto br0
     iface br0 inet static
       bridge_ports eth0
@@ -145,7 +146,7 @@ on each node:
 
 === configure iptables (via ferm) ===
 
-ipsum loren bacon puppet: the nodes must connect to each other over the private network for drbd purposes; puppet can handle this (poorly; needs improvement)
+the nodes must connect to each other over the public and private networks for a number of reasons; see the ganeti2 module in puppet
 
 === instantiate the cluster ===
 
@@ -179,7 +180,7 @@ For each slave node (only bar for this example):
 
 on the slave, append the master's /etc/ssh/ssh_host_rsa_key.pub to
 /etc/ssh/userkeys/root.  This is only required temporarily - once
-everything works puppet will put it/keep it there.
+everything works, puppet will put it/keep it there.
 
 on the master node (foo):
 
@@ -207,11 +208,7 @@ If everything has been configured correctly, no errors should be reported.
 
 === create the 'dsa' variant ===
 
-ipsum loren bacon deboostrap+dsa
-
-* create /etc/ganeti/instance-debootstrap/variants/dsa.conf
-* add 'dsa' to /etc/ganeti/instance-debootstrap/variants.list
-* obtain ??-dsa-* from tristano:/etc/ganeti/instance-debootstrap/hooks
+Ensure that the debootstrap+dsa variant has been installed by puppet (see ganeti2 module in dsa-puppet).
 
 ----
 
@@ -242,7 +239,7 @@ Note the following:
 
 * the primary and secondary nodes have been explicitly set
 * the operating system type is 'debootstrap+dsa'
-* the network interfarce 0 (eth1 on the system) is set to the instance's interface on the public network
+* the network interfarce 0 (eth0 on the system) is set to the instance's interface on the public network
 * If qux.d.o does not yet exist in DNS/LDAP, you may need --no-ip-check --no-name-check.  Be careful that the hostname and IP address are not taken already!
 
 ----
@@ -253,11 +250,11 @@ If the instances require access to the private network, then there are two modif
 
 === re-configure networking ===
 
-Ensure that br1 is configured (rather than eth1).
+On the nodes, ensure that br1 is configured (rather than eth1).
 
-{{{
-    # /etc/networking/interfaces for foo.debian.org
+This is the interfaces file for foo.debian.org:
 
+{{{
     auto br0
     iface br0 inet static
       bridge_ports eth0
@@ -278,9 +275,32 @@ Ensure that br1 is configured (rather than eth1).
       up ip link set addr $(cat /sys/class/net/$IFACE/address) dev $IFACE
 }}}
 
+This is the interfaces file for bar.debian.org:
+
+{{{
+    auto br0
+    iface br0 inet static
+      bridge_ports eth0
+      bridge_maxwait 0
+      bridge_fd 0
+      address A.B.C.3
+      netmask 255.255.255.0
+      gateway A.B.C.254
+      up ip link set addr $(cat /sys/class/net/$IFACE/address) dev $IFACE
+
+    auto br1
+    iface br1 inet static
+      bridge_ports eth1
+      bridge_maxwait 0
+      bridge_fd 0
+      address E.F.G.3
+      netmask 255.255.255.0
+      up ip link set addr $(cat /sys/class/net/$IFACE/address) dev $IFACE
+}}}
+
 === create or update the instance  ===
 
-When creating the instance, indicate both netwokrs:
+When creating the instance, indicate both networks:
 
 {{{
     gnt-instance add \