From db0e97f05d8fda6da98f6ac9a34f75b2f2c2827b Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 30 Apr 2013 15:53:11 +0200
Subject: [PATCH] INSTALL updates for wheezy, and fixes
- Remove mention of python 2.4 specific modules, as that version
is not supported anymore
- Add bitarray and ipaddr
- Remove a double space
- Add mandatory C library packages too
- Mention the option of using drbd modules directly from your kernel
This also fixes Issue 372.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>
---
INSTALL | 27 +++++++++++++++++----------
doc/install.rst | 7 +++++++
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/INSTALL b/INSTALL
index 6b3825d62..6c5f6784b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,17 +36,12 @@ Before installing, please verify that you have the following programs:
1.4.6 or above
- `pyinotify Python module <https://github.com/seb-m/pyinotify>`_
- `PycURL Python module <http://pycurl.sourceforge.net/>`_
-- `ctypes Python module
- <http://starship.python.net/crew/theller/ctypes/>`_, if running on
- python 2.4 (optional, used for node daemon memory locking)
- `socat <http://www.dest-unreach.org/socat/>`_, see :ref:`note
<socat-note>` below
- `Paramiko <http://www.lag.net/paramiko/>`_, if you want to use
``ganeti-listrunner``
- `affinity Python module <http://pypi.python.org/pypi/affinity/0.1.0>`_,
optional python package for supporting CPU pinning under KVM
-- `ElementTree Python module <http://effbot.org/zone/element-index.htm>`_,
- if running on python 2.4 (optional, used by the ``ovfconverter`` tool)
- `qemu-img <http://qemu.org/>`_, if you want to use ``ovfconverter``
- `fping <http://fping.sourceforge.net/>`_
- `Python IP address manipulation library
@@ -61,8 +56,19 @@ packages, except for RBD, DRBD and Xen::
$ apt-get install lvm2 ssh bridge-utils iproute iputils-arping \
ndisc6 python python-pyopenssl openssl \
- python-pyparsing python-simplejson \
- python-pyinotify python-pycurl socat fping
+ python-pyparsing python-simplejson python-bitarray \
+ python-pyinotify python-pycurl python-ipaddr socat fping
+
+If bitarray is missing it can be installed from easy-install::
+
+ $ easy_install bitarray
+
+Or on newer distributions (eg. Debian Wheezy) the above becomes::
+
+ $ apt-get install lvm2 ssh bridge-utils iproute iputils-arping \
+ ndisc6 python python-openssl openssl \
+ python-pyparsing python-simplejson python-bitarray \
+ python-pyinotify python-pycurl python-ipaddr socat fping
Note that this does not install optional packages::
@@ -142,7 +148,7 @@ Some of these are also available as package in Debian/Ubuntu::
Or in newer versions of these distributions (using GHC 7.x)::
$ apt-get install ghc libghc-json-dev libghc-network-dev \
- libghc-parallel-dev libghc-deepseq-dev \
+ libghc-parallel-dev libghc-deepseq-dev \
libghc-utf8-string-dev
In Fedora, they are available via packages as well::
@@ -194,11 +200,12 @@ the exception of curl), so you can use either apt::
$ apt-get install libghc-hslogger-dev libghc-crypto-dev libghc-text-dev \
libghc-hinotify-dev libghc-regex-pcre-dev libghc-curl-dev \
- libghc-attoparsec-dev libghc-vector-dev
+ libghc-attoparsec-dev libghc-vector-dev libpcre3-dev
or ``cabal``::
- $ cabal install hslogger Crypto text hinotify regex-pcre curl \
+ $ apt-get install libprcre3-dev libcurl4-openssl-dev
+ $ cabal install hslogger Crypto text hinotify==0.3.2 regex-pcre curl \
attoparsec vector
to install them.
diff --git a/doc/install.rst b/doc/install.rst
index 8f753d656..435d22c34 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -301,6 +301,13 @@ instances on a node.
$ apt-get install drbd8-source drbd8-utils
$ m-a update
$ m-a a-i drbd8
+
+ Or on newer versions, if the kernel already has modules:
+
+ $ apt-get install drbd8-utils
+
+ Then to configure it for Ganeti::
+
$ echo drbd minor_count=128 usermode_helper=/bin/true >> /etc/modules
$ depmod -a
$ modprobe drbd minor_count=128 usermode_helper=/bin/true
--
GitLab