From fda2c69d23020e5a7953b5f95e41174c8f6b9629 Mon Sep 17 00:00:00 2001
From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Sat, 16 Jun 2012 18:27:35 +0000
Subject: [PATCH] slight improvement to docs

---
 input/howto/install-ganeti.creole | 34 ++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/input/howto/install-ganeti.creole b/input/howto/install-ganeti.creole
index b46038e..f7bb1b5 100644
--- a/input/howto/install-ganeti.creole
+++ b/input/howto/install-ganeti.creole
@@ -58,7 +58,7 @@ The bridge interface, br0, is used by the guest virtual machines to reach the
 public network.
 
 If the guest virtual machines need to access the private network, then br1
-should be configure rather than eth1.
+should be configured rather than eth1.
 
 To prevent the link address changing due to startup/shutdown of virtual
 machines, explicitly set the value.
@@ -82,6 +82,25 @@ machines, explicitly set the value.
       netmask 255.255.255.0
 }}}
 
+{{{
+    # /etc/networking/interfaces 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 eth1
+    iface eth1 inet static
+      address E.F.G.3
+      netmask 255.255.255.0
+}}}
+
 === configure lvm ===
 
 On each node, configure lvm to ignore drbd devices and to prefer
@@ -90,7 +109,7 @@ On each node, configure lvm to ignore drbd devices and to prefer
 
 {{{
     ssed -i \
-      -e 's#^\(\s*filter\s\).*#\1= [ "a|.*|", "r|/dev/drbd[0-9]+|" ]#'
+      -e 's#^\(\s*filter\s\).*#\1= [ "a|.*|", "r|/dev/drbd[0-9]+|" ]#' \
       -e 's#^\(\s*preferred_names\s\).*#\1= [ "^/dev/dm-*/", "^/dev/cciss/" ]#' \
       /etc/lvm/lvm.conf
     service lvm2 restart
@@ -107,7 +126,8 @@ On each node, create a volume group:
 === create kvmU symbolic links ===
 
 On each node, create vmlinuz and initrd symlinks as expected by the kvm
-hypervisor:
+hypervisor (not strictly required if all guests will boot from their own
+kernels):
 
 {{{
     ln -s -T /boot/vmlinuz-2.6.32-5-amd64 /boot/vmlinuz-2.6-kvmU
@@ -116,11 +136,11 @@ hypervisor:
 
 === exchange ssh keys ===
 
-ipsum loren bacon puppet
+ipsum loren bacon puppet: the ssh keys for nodes must be added to root:/etc/.ssh/authorized_keys (or /etc/ssh/keys/root) on all nodes; puppet can handle this (poorly; needs improvement)
 
 === configure iptables (via ferm) ===
 
-ipsum loren bacon puppet
+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)
 
 === instantiate the cluster ===
 
@@ -178,6 +198,10 @@ If everything has been configured correctly, no errors should be reported.
 
 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
+
 ----
 
 == How To Install Ganeti Instances ==
-- 
2.20.1