Commit e0897adf authored by Michael Hanselmann's avatar Michael Hanselmann

Start to prepare documentation for 2.2 release

- Update NEWS file
- Remove dependency on OpenSSL (pyOpenSSL remains)
- Update manpages, fix typos and other things
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent fc0726b9
...@@ -20,7 +20,6 @@ Before installing, please verify that you have the following programs: ...@@ -20,7 +20,6 @@ Before installing, please verify that you have the following programs:
- `DRBD <http://www.drbd.org/>`_, kernel module and userspace utils, - `DRBD <http://www.drbd.org/>`_, kernel module and userspace utils,
version 8.0.7 or above version 8.0.7 or above
- `LVM2 <http://sourceware.org/lvm2/>`_ - `LVM2 <http://sourceware.org/lvm2/>`_
- `OpenSSL <http://www.openssl.org/>`_
- `OpenSSH <http://www.openssh.com/portable.html>`_ - `OpenSSH <http://www.openssh.com/portable.html>`_
- `bridge utilities <http://www.linuxfoundation.org/en/Net:Bridge>`_ - `bridge utilities <http://www.linuxfoundation.org/en/Net:Bridge>`_
- `iproute2 <http://www.linuxfoundation.org/en/Net:Iproute2>`_ - `iproute2 <http://www.linuxfoundation.org/en/Net:Iproute2>`_
......
...@@ -4,9 +4,28 @@ News ...@@ -4,9 +4,28 @@ News
Version 2.2.0 Version 2.2.0
------------- -------------
- Added tool (``move-instance``) and infrastructure to move instances
between separate clusters (see :doc:`separate documentation
<move-instance>` and :doc:`design document <design-2.2>`)
- Added per-request RPC timeout
- RAPI now requires a Content-Type header for requests with a body (e.g. - RAPI now requires a Content-Type header for requests with a body (e.g.
``PUT`` or ``POST``) which must be set to ``application/json`` (see ``PUT`` or ``POST``) which must be set to ``application/json`` (see
RFC2616 (HTTP/1.1), section 7.2.1) RFC2616 (HTTP/1.1), section 7.2.1)
- ``ganeti-watcher`` attempts to restart ``ganeti-rapi`` if RAPI is not
reachable
- Implemented initial support for running Ganeti daemons as separate
users, see configure-time flags ``--with-user-prefix`` and
``--with-group-prefix`` (only ``ganeti-rapi`` is supported at this
time)
- Instances can be removed after export (``gnt-backup export
--remove-instance``)
- Self-signed certificates generated by Ganeti now use a 2048 bit RSA
key (instead of 1024 bit)
- Added new cluster configuration file for cluster domain secret
- Import/export now use SSL instead of SSH
- Added support for showing estimated time when exporting an instance,
see the ``ganeti-os-interface(7)`` manpage and look for
``EXP_SIZE_FD``
Version 2.1.3 Version 2.1.3
......
Ganeti 2.1 Ganeti 2.2
========== ==========
For installation instructions, read the INSTALL and the doc/install.html For installation instructions, read the INSTALL and the doc/install.html
......
...@@ -1244,7 +1244,7 @@ watch command:: ...@@ -1244,7 +1244,7 @@ watch command::
Mon Oct 26 00:22:52 2009 adding instance instance1 to cluster config Mon Oct 26 00:22:52 2009 adding instance instance1 to cluster config
Mon Oct 26 00:22:52 2009 - INFO: Waiting for instance instance1 to sync disks. Mon Oct 26 00:22:52 2009 - INFO: Waiting for instance instance1 to sync disks.
Mon Oct 26 00:23:03 2009 creating os for instance xen-devi-18.fra.corp.google.com on node mpgntac4.fra.corp.google.com Mon Oct 26 00:23:03 2009 creating os for instance instance1 on node node1
Mon Oct 26 00:23:03 2009 * running the instance OS create scripts... Mon Oct 26 00:23:03 2009 * running the instance OS create scripts...
Mon Oct 26 00:23:13 2009 * starting instance... Mon Oct 26 00:23:13 2009 * starting instance...
node1# node1#
...@@ -1374,6 +1374,13 @@ cluster config - while not trivial, the layout of the cluster can be ...@@ -1374,6 +1374,13 @@ cluster config - while not trivial, the layout of the cluster can be
recreated from it and if the instance disks have not been lost it recreated from it and if the instance disks have not been lost it
permits recovery from the loss of all master candidates. permits recovery from the loss of all master candidates.
move-instance
+++++++++++++
See :doc:`separate documentation for move-instance <move-instance>`.
.. TODO: document cluster-merge tool
Other Ganeti projects Other Ganeti projects
--------------------- ---------------------
......
...@@ -38,7 +38,7 @@ master_doc = 'index' ...@@ -38,7 +38,7 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'Ganeti' project = u'Ganeti'
copyright = u'2006, 2007, 2008, 2009, Google Inc.' copyright = u'2006, 2007, 2008, 2009, 2010, Google Inc.'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<para> <para>
Report bugs to <ulink Report bugs to <ulink
url="http://code.google.com/p/ganeti/"></ulink> or contact the url="http://code.google.com/p/ganeti/"></ulink> or contact the
developers using the ganeti mailing list developers using the Ganeti mailing list
&lt;ganeti@googlegroups.com&gt;. &lt;ganeti@googlegroups.com&gt;.
</para> </para>
</refsect1> </refsect1>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<title>COPYRIGHT</title> <title>COPYRIGHT</title>
<para> <para>
Copyright (C) 2006, 2007, 2008, 2009 Google Inc. Permission is Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc. Permission is
granted to copy, distribute and/or modify under the terms of the granted to copy, distribute and/or modify under the terms of the
&gnu; General Public License as published by the Free Software &gnu; General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) Foundation; either version 2 of the License, or (at your option)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- Fill in your name for FIRSTNAME and SURNAME. --> <!-- Fill in your name for FIRSTNAME and SURNAME. -->
<!-- Please adjust the date whenever revising the manpage. --> <!-- Please adjust the date whenever revising the manpage. -->
<!ENTITY dhdate "<date>May 17, 2010</date>"> <!ENTITY dhdate "<date>June 08, 2010</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). --> allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>8</manvolnum>"> <!ENTITY dhsection "<manvolnum>8</manvolnum>">
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
&dhucpackage; &dhucpackage;
&dhsection; &dhsection;
<refmiscinfo>ganeti 2.0</refmiscinfo> <refmiscinfo>Ganeti 2.2</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>&dhpackage;</refname> <refname>&dhpackage;</refname>
<refpurpose>ganeti job queue cleaner</refpurpose> <refpurpose>Ganeti job queue cleaner</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
......
<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!-- Please adjust the date whenever revising the manpage. --> <!-- Please adjust the date whenever revising the manpage. -->
<!ENTITY dhdate "<date>October 21, 2009</date>"> <!ENTITY dhdate "<date>June 08, 2010</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). --> allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>8</manvolnum>"> <!ENTITY dhsection "<manvolnum>8</manvolnum>">
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
&dhucpackage; &dhucpackage;
&dhsection; &dhsection;
<refmiscinfo>ganeti 2.1</refmiscinfo> <refmiscinfo>Ganeti 2.2</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>&dhpackage;</refname> <refname>&dhpackage;</refname>
<refpurpose>ganeti conf daemon</refpurpose> <refpurpose>Ganeti conf daemon</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
The confd protocol is an HMAC authenticated json-encoded custom format, The confd protocol is an HMAC authenticated json-encoded custom format,
over UDP. A client library is provided to make it easy to write over UDP. A client library is provided to make it easy to write
software to query confd. More information can be found in the Ganeti software to query confd. More information can be found in the Ganeti
2.1 design doc, and an example usage can be seen in the (external) nbma 2.1 design doc, and an example usage can be seen in the (external) NBMA
daemon for ganeti. daemon for Ganeti.
</para> </para>
</refsect2> </refsect2>
......
<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!-- Please adjust the date whenever revising the manpage. --> <!-- Please adjust the date whenever revising the manpage. -->
<!ENTITY dhdate "<date>February 11, 2009</date>"> <!ENTITY dhdate "<date>June 08, 2010</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). --> allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>8</manvolnum>"> <!ENTITY dhsection "<manvolnum>8</manvolnum>">
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<copyright> <copyright>
<year>2008</year> <year>2008</year>
<year>2009</year> <year>2009</year>
<year>2010</year>
<holder>Google Inc.</holder> <holder>Google Inc.</holder>
</copyright> </copyright>
&dhdate; &dhdate;
...@@ -27,12 +28,12 @@ ...@@ -27,12 +28,12 @@
&dhucpackage; &dhucpackage;
&dhsection; &dhsection;
<refmiscinfo>ganeti 2.0</refmiscinfo> <refmiscinfo>Ganeti 2.2</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>&dhpackage;</refname> <refname>&dhpackage;</refname>
<refpurpose>ganeti master daemon</refpurpose> <refpurpose>Ganeti master daemon</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
......
<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!-- Please adjust the date whenever revising the manpage. --> <!-- Please adjust the date whenever revising the manpage. -->
<!ENTITY dhdate "<date>February 11, 2009</date>"> <!ENTITY dhdate "<date>June 08, 2010</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). --> allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>8</manvolnum>"> <!ENTITY dhsection "<manvolnum>8</manvolnum>">
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<year>2007</year> <year>2007</year>
<year>2008</year> <year>2008</year>
<year>2009</year> <year>2009</year>
<year>2010</year>
<holder>Google Inc.</holder> <holder>Google Inc.</holder>
</copyright> </copyright>
&dhdate; &dhdate;
...@@ -29,12 +30,12 @@ ...@@ -29,12 +30,12 @@
&dhucpackage; &dhucpackage;
&dhsection; &dhsection;
<refmiscinfo>ganeti 2.0</refmiscinfo> <refmiscinfo>Ganeti 2.2</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>&dhpackage;</refname> <refname>&dhpackage;</refname>
<refpurpose>ganeti node daemon</refpurpose> <refpurpose>Ganeti node daemon</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
...@@ -49,14 +50,18 @@ ...@@ -49,14 +50,18 @@
<para> <para>
The <command>&dhpackage;</command> is the daemon which is The <command>&dhpackage;</command> is the daemon which is
responsible for the node functions in the ganeti system. responsible for the node functions in the Ganeti system.
</para> </para>
<para> <para>
By default, in order to be able to support features such as node By default, in order to be able to support features such as node
powercycling even on systems with a very damaged root disk, ganeti-noded powercycling even on systems with a very damaged root disk,
mlocks itself in ram. You can disable this feature by passing in the <command>ganeti-noded</command> locks itself in RAM using
<option>--no-mlock</option>. <citerefentry>
<refentrytitle>mlockall</refentrytitle>
<manvolnum>2</manvolnum>
</citerefentry>. You can disable this feature by passing in the
<option>--no-mlock</option> to the daemon.
</para> </para>
<para> <para>
...@@ -75,16 +80,17 @@ ...@@ -75,16 +80,17 @@
</para> </para>
<para> <para>
The ganeti-noded daemon listens to port 1811 TCP, on all interfaces, by The <command>ganeti-noded</command> daemon listens to port 1811 TCP, on
default. This can be overridden by an entry in /etc/services or by all interfaces, by default. This can be overridden by an entry the
passing the <option>-p</option> option. The <option>-b</option> option services database (<filename>/etc/services</filename>) or by passing the
can be used to specify the address to bind to (defaults to 0.0.0.0). <option>-p</option> option. The <option>-b</option> option can be used to
specify the address to bind to (defaults to 0.0.0.0).
</para> </para>
<para> <para>
Ganeti noded communication is protected via SSL, with a key generated at Ganeti noded communication is protected via SSL, with a key generated at
cluster init time. This can be disabled with the cluster init time. This can be disabled with the
<option>--no-ssl</option> option, or a different ssl key and certificate <option>--no-ssl</option> option, or a different SSL key and certificate
can be specified using the <option>-K</option> and <option>-C</option> can be specified using the <option>-K</option> and <option>-C</option>
options. options.
</para> </para>
...@@ -113,8 +119,8 @@ ...@@ -113,8 +119,8 @@
<refsect2> <refsect2>
<title>COMMUNICATION PROTOCOL</title> <title>COMMUNICATION PROTOCOL</title>
<para> <para>
Currently the master-node RPC is done using a simple json-RPC Currently the master-node RPC is done using a simple RPC protocol built
over HTTP(S). using JSON over HTTP(S).
</para> </para>
</refsect2> </refsect2>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- Fill in your name for FIRSTNAME and SURNAME. --> <!-- Fill in your name for FIRSTNAME and SURNAME. -->
<!-- Please adjust the date whenever revising the manpage. --> <!-- Please adjust the date whenever revising the manpage. -->
<!ENTITY dhdate "<date>October 02, 2009</date>"> <!ENTITY dhdate "<date>June 08, 2010</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). --> allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>7</manvolnum>"> <!ENTITY dhsection "<manvolnum>7</manvolnum>">
...@@ -31,14 +31,12 @@ ...@@ -31,14 +31,12 @@
&dhucpackage; &dhucpackage;
&dhsection; &dhsection;
<refmiscinfo>ganeti 2.1</refmiscinfo> <refmiscinfo>Ganeti 2.2</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>ganeti-os-interface</refname> <refname>ganeti-os-interface</refname>
<refpurpose>specifications for guest OS types <refpurpose>Specifications for guest OS types</refpurpose>
</refpurpose>
</refnamediv> </refnamediv>
<refsect1> <refsect1>
...@@ -75,7 +73,7 @@ ...@@ -75,7 +73,7 @@
<varlistentry> <varlistentry>
<term>OS_API_VERSION</term> <term>OS_API_VERSION</term>
<listitem> <listitem>
<simpara>The OS api version that the rest of the <simpara>The OS API version that the rest of the
environment conforms to.</simpara> environment conforms to.</simpara>
</listitem> </listitem>
</varlistentry> </varlistentry>
...@@ -89,11 +87,11 @@ ...@@ -89,11 +87,11 @@
<varlistentry> <varlistentry>
<term>INSTANCE_OS</term> <term>INSTANCE_OS</term>
<listitem> <listitem>
<simpara>The name os the instance's OS as Ganeti knows <simpara>The name of the instance's OS as Ganeti knows
it. This can simplify the OS scripts by providing the same it. This can simplify the OS scripts by providing the same
scripts under multiple names, and then the scripts can use scripts under multiple names, and then the scripts can use
this name to alter their behaviour.</simpara> this name to alter their behaviour.</simpara>
<simpara>Under OS api 15 changing the script behavior based <simpara>With OS API 15 changing the script behavior based
on this variable is deprecated: OS_VARIANT should be used on this variable is deprecated: OS_VARIANT should be used
instead (see below).</simpara> instead (see below).</simpara>
</listitem> </listitem>
...@@ -105,7 +103,7 @@ ...@@ -105,7 +103,7 @@
must support all variants listed under its must support all variants listed under its
<filename>variants.list</filename> file, and may support more. <filename>variants.list</filename> file, and may support more.
Any more supported variants should be properly documented in the Any more supported variants should be properly documented in the
per-os documentation.</simpara> per-OS documentation.</simpara>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
...@@ -233,7 +231,7 @@ ...@@ -233,7 +231,7 @@
<para>The <envar>INSTANCE_REINSTALL</envar> variable is set to '1' when <para>The <envar>INSTANCE_REINSTALL</envar> variable is set to '1' when
this create request is reinstalling and existing instance, rather than this create request is reinstalling and existing instance, rather than
creating one anew. This can be used, for example, to preserve some creating one anew. This can be used, for example, to preserve some
data in the old instance in an os-specific way.</para> data in the old instance in an OS-specific way.</para>
</refsect2> </refsect2>
...@@ -328,11 +326,11 @@ fi ...@@ -328,11 +326,11 @@ fi
<title>ganeti_api_version</title> <title>ganeti_api_version</title>
<para> <para>
The <filename>ganeti_api_version</filename> file is a plain The <filename>ganeti_api_version</filename> file is a plain
text file containing the version(s) of the guest OS api that text file containing the version(s) of the guest OS API that
this OS definition complies with, one per line. The version this OS definition complies with, one per line. The version
documented by this man page is 15, so this file must contain documented by this man page is 15, so this file must contain
the number 15 followed by a newline if only this version is the number 15 followed by a newline if only this version is
supported. A script compatible more than one ganeti version supported. A script compatible with more than one Ganeti version
should contain the most recent version first (i.e. 15), should contain the most recent version first (i.e. 15),
followed by the old version(s) (in this case 10 and/or 5). followed by the old version(s) (in this case 10 and/or 5).
</para> </para>
...@@ -353,11 +351,11 @@ fi ...@@ -353,11 +351,11 @@ fi
<title>NOTES</title> <title>NOTES</title>
<refsect2> <refsect2>
<title>Retrocompatibility</title> <title>Backwards compatibility</title>
<para> <para>
Ganeti 2.1 is compatible with both api version 10, and 15. Ganeti 2.2 is compatible with both API version 10, and 15.
In api version 10 the <filename>variants.list</filename> In API version 10 the <filename>variants.list</filename>
file is ignored and no OS_VARIANT environment variable is file is ignored and no OS_VARIANT environment variable is
passed. passed.
</para> </para>
...@@ -394,7 +392,7 @@ fi ...@@ -394,7 +392,7 @@ fi
<title>Version 5 to 10</title> <title>Version 5 to 10</title>
<para> <para>
The method os passing data has changed from command line The method for passing data has changed from command line
options to environment variables, so scripts should be options to environment variables, so scripts should be
modified to use these. For an example of how this can be modified to use these. For an example of how this can be
done in a way compatible with both versions, feel free to done in a way compatible with both versions, feel free to
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- Fill in your name for FIRSTNAME and SURNAME. --> <!-- Fill in your name for FIRSTNAME and SURNAME. -->
<!-- Please adjust the date whenever revising the manpage. --> <!-- Please adjust the date whenever revising the manpage. -->
<!ENTITY dhdate "<date>February 11, 2009</date>"> <!ENTITY dhdate "<date>June 08, 2010</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). --> allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>8</manvolnum>"> <!ENTITY dhsection "<manvolnum>8</manvolnum>">
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<copyright> <copyright>
<year>2008</year> <year>2008</year>
<year>2009</year> <year>2009</year>
<year>2010</year>
<holder>Google Inc.</holder> <holder>Google Inc.</holder>
</copyright> </copyright>
&dhdate; &dhdate;
...@@ -28,12 +29,12 @@ ...@@ -28,12 +29,12 @@
&dhucpackage; &dhucpackage;
&dhsection; &dhsection;
<refmiscinfo>ganeti 2.0</refmiscinfo> <refmiscinfo>Ganeti 2.2</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>&dhpackage;</refname> <refname>&dhpackage;</refname>
<refpurpose>ganeti remote API daemon</refpurpose> <refpurpose>Ganeti remote API daemon</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
...@@ -112,6 +113,10 @@ guest tespw ...@@ -112,6 +113,10 @@ guest tespw
read-write rights, whereas the second user does only have read read-write rights, whereas the second user does only have read
(query) rights, and as such is no different than not using (query) rights, and as such is no different than not using
authentication at all.</para> authentication at all.</para>
<para>More details (including on how to use hashed passwords) can be found
in the Ganeti documentation.</para>
</refsect1> </refsect1>
&footer; &footer;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- Fill in your name for FIRSTNAME and SURNAME. --> <!-- Fill in your name for FIRSTNAME and SURNAME. -->
<!-- Please adjust the date whenever revising the manpage. --> <!-- Please adjust the date whenever revising the manpage. -->
<!ENTITY dhdate "<date>February 11, 2009</date>"> <!ENTITY dhdate "<date>June 08, 2010</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). --> allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>8</manvolnum>"> <!ENTITY dhsection "<manvolnum>8</manvolnum>">
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<year>2007</year> <year>2007</year>
<year>2008</year> <year>2008</year>
<year>2009</year> <year>2009</year>
<year>2010</year>
<holder>Google Inc.</holder> <holder>Google Inc.</holder>
</copyright> </copyright>
&dhdate; &dhdate;
...@@ -29,12 +30,12 @@ ...@@ -29,12 +30,12 @@
&dhucpackage; &dhucpackage;
&dhsection; &dhsection;
<refmiscinfo>ganeti 2.0</refmiscinfo> <refmiscinfo>Ganeti 2.2</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>&dhpackage;</refname> <refname>&dhpackage;</refname>
<refpurpose>ganeti cluster watcher</refpurpose> <refpurpose>Ganeti cluster watcher</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
...@@ -80,7 +81,7 @@ ...@@ -80,7 +81,7 @@
<para> <para>
In addition, it will execute any scripts which exist under the In addition, it will execute any scripts which exist under the
<quote>watcher</quote> directory in the ganeti hooks directory <quote>watcher</quote> directory in the Ganeti hooks directory
(@SYSCONFDIR@/ganeti/hooks). This should be used for (@SYSCONFDIR@/ganeti/hooks). This should be used for
lightweight actions, like starting any extra daemons. lightweight actions, like starting any extra daemons.
</para> </para>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- Fill in your name for FIRSTNAME and SURNAME. --> <!-- Fill in your name for FIRSTNAME and SURNAME. -->
<!-- Please adjust the date whenever revising the manpage. --> <!-- Please adjust the date whenever revising the manpage. -->