Commit cbf3d64b authored by Michael Hanselmann's avatar Michael Hanselmann

Include INSTALL in documentation

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent c27ba1cc
......@@ -42,6 +42,7 @@
/doc/api
/doc/build
/doc/html
/doc/install-quick.rst
/doc/news.rst
/doc/*.in
/doc/*.png
......
......@@ -46,6 +46,7 @@ DIRS = \
MAINTAINERCLEANFILES = \
$(docpng) \
$(maninput) \
doc/install-quick.rst \
doc/news.rst
maintainer-clean-local:
......@@ -148,6 +149,7 @@ docrst = \
doc/hooks.rst \
doc/iallocator.rst \
doc/index.rst \
doc/install-quick.rst \
doc/install.rst \
doc/locking.rst \
doc/news.rst \
......@@ -176,6 +178,14 @@ doc/news.rst: NEWS
cat $<; \
} > $@
doc/install-quick.rst: INSTALL
set -e; \
{ echo '.. This file is automatically updated at build time from $<.'; \
echo '.. Do not edit.'; \
echo; \
cat $<; \
} > $@
docdot = \
doc/arch-2.0.dot \
doc/design-2.1-lock-acquire.dot \
......
......@@ -4,7 +4,8 @@ Developer notes
Build dependencies
------------------
Most dependencies from INSTALL, plus:
Most dependencies from :doc:`install-quick`, plus:
- `GNU make <http://www.gnu.org/software/make/>`_
- `GNU tar <http://www.gnu.org/software/tar/>`_
- `Gzip <http://www.gnu.org/software/gzip/>`_
......
......@@ -9,6 +9,7 @@ Contents:
.. toctree::
:maxdepth: 2
install-quick.rst
install.rst
admin.rst
walkthrough.rst
......
......@@ -299,44 +299,7 @@ instances on a node.
Other required software
+++++++++++++++++++++++
Besides Xen and DRBD, you will need to install the following (on all
nodes):
- LVM version 2, `<http://sourceware.org/lvm2/>`_
- OpenSSL, `<http://www.openssl.org/>`_
- OpenSSH, `<http://www.openssh.com/portable.html>`_
- bridge utilities, `<http://bridge.sourceforge.net/>`_
- iproute2, `<http://developer.osdl.org/dev/iproute2>`_
- arping (part of iputils package),
`<ftp://ftp.inr.ac.ru/ip-routing/iputils-current.tar.gz>`_
- Python version 2.4 or 2.5, `<http://www.python.org>`_
- Python OpenSSL bindings, `<http://pyopenssl.sourceforge.net/>`_
- simplejson Python module, `<http://www.undefined.org/python/#simplejson>`_
- pyparsing Python module, `<http://pyparsing.wikispaces.com/>`_
- pyinotify Python module, `<http://trac.dbzteam.org/pyinotify>`_
These programs are supplied as part of most Linux distributions, so
usually they can be installed via apt or similar methods. Also many of
them will already be installed on a standard machine.
.. admonition:: Debian
You can use this command line to install all needed packages::
# apt-get install lvm2 ssh bridge-utils iproute iputils-arping \
python python-pyopenssl openssl python-pyparsing \
python-simplejson python-pyinotify
See :doc:`install-quick`.
Setting up the environment for Ganeti
-------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment