--select-instances hbal manpage update

[ganeti-local] / doc / install.rst

diff --git a/doc/install.rst b/doc/install.rst
index b1a2f68..83659df 100644 (file)
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -98,9 +98,9 @@ and not just *node1*.
    but for Ganeti you need to have::
 
      127.0.0.1       localhost
-     192.168.1.1     node1.example.com node1
+     192.0.2.1     node1.example.com node1
 
-   replacing ``192.168.1.1`` with your node's address. Also, the file
+   replacing ``192.0.2.1`` with your node's address. Also, the file
    ``/etc/hostname`` which configures the hostname of the system
    should contain ``node1.example.com`` and not just ``node1`` (you
    need to run the command ``/etc/init.d/hostname.sh start`` after
@@ -179,13 +179,13 @@ other. For example::
   (xend-relocation-server yes)
   (xend-relocation-port 8002)
   (xend-relocation-address '')
-  (xend-relocation-hosts-allow '^192\\.168\\.3\\.[0-9]+$')
+  (xend-relocation-hosts-allow '^192\\.0\\.2\\.[0-9]+$')
 
 
 The second line assumess that the hypervisor parameter
 ``migration_port`` is set 8002, otherwise modify it to match. The last
 line assumes that all your nodes have secondary IPs in the
-192.168.3.0/24 network, adjust it accordingly to your setup.
+192.0.2.0/24 network, adjust it accordingly to your setup.
 
 .. admonition:: Debian
 
@@ -288,12 +288,16 @@ instances on a node.
    configure any drbd devices. You can do this by prefixing all
    *resource* lines in the file with the keyword *skip*, like this::
 
-     skip resource r0 {
-       ...
+     skip {
+       resource r0 {
+         ...
+       }
      }
 
-     skip resource "r1" {
-       ...
+     skip {
+       resource "r1" {
+         ...
+       }
      }
 
 Other required software
@@ -470,13 +474,13 @@ To be able to install instances you need to have an Operating System
 installation script. An example OS that works under Debian and can
 install Debian and Ubuntu instace OSes is provided on the project web
 site.  Download it from the project page and follow the instructions in
-the ``README`` file.  Here is the installation procedure (replace 0.7
+the ``README`` file.  Here is the installation procedure (replace 0.9
 with the latest version that is compatible with your ganeti version)::
 
   cd /usr/local/src/
-  wget http://ganeti.googlecode.com/files/ganeti-instance-debootstrap-0.7.tar.gz
-  tar xzf ganeti-instance-debootstrap-0.7.tar.gz
-  cd ganeti-instance-debootstrap-0.7
+  wget http://ganeti.googlecode.com/files/ganeti-instance-debootstrap-0.9.tar.gz
+  tar xzf ganeti-instance-debootstrap-0.9.tar.gz
+  cd ganeti-instance-debootstrap-0.9
   ./configure
   make
   make install
@@ -494,6 +498,20 @@ installed.
 
      apt-get install debootstrap dump kpartx
 
+.. admonition:: KVM
+
+   In order for debootstrap instances to be able to shutdown cleanly
+   they must install have basic acpi support inside the instance. Which
+   packages are needed depend on the exact flavor of debian or ubuntu
+   which you're installing, but the example defaults file has a
+   commented out configuration line that works for debian lenny and
+   squeeze::
+
+     EXTRA_PKGS="acpi-support-base,console-tools,udev"
+
+   kbd can be used instead of console-tools, and more packages can be
+   added, of course, if needed.
+
 Alternatively, you can create your own OS definitions. See the manpage
 :manpage:`ganeti-os-interface`.