Revision e0897adf

b/INSTALL
20 20
- `DRBD <http://www.drbd.org/>`_, kernel module and userspace utils,
21 21
  version 8.0.7 or above
22 22
- `LVM2 <http://sourceware.org/lvm2/>`_
23
- `OpenSSL <http://www.openssl.org/>`_
24 23
- `OpenSSH <http://www.openssh.com/portable.html>`_
25 24
- `bridge utilities <http://www.linuxfoundation.org/en/Net:Bridge>`_
26 25
- `iproute2 <http://www.linuxfoundation.org/en/Net:Iproute2>`_
b/NEWS
4 4
Version 2.2.0
5 5
-------------
6 6

  
7
- Added tool (``move-instance``) and infrastructure to move instances
8
  between separate clusters (see :doc:`separate documentation
9
  <move-instance>` and :doc:`design document <design-2.2>`)
10
- Added per-request RPC timeout
7 11
- RAPI now requires a Content-Type header for requests with a body (e.g.
8 12
  ``PUT`` or ``POST``) which must be set to ``application/json`` (see
9 13
  RFC2616 (HTTP/1.1), section 7.2.1)
14
- ``ganeti-watcher`` attempts to restart ``ganeti-rapi`` if RAPI is not
15
  reachable
16
- Implemented initial support for running Ganeti daemons as separate
17
  users, see configure-time flags ``--with-user-prefix`` and
18
  ``--with-group-prefix`` (only ``ganeti-rapi`` is supported at this
19
  time)
20
- Instances can be removed after export (``gnt-backup export
21
  --remove-instance``)
22
- Self-signed certificates generated by Ganeti now use a 2048 bit RSA
23
  key (instead of 1024 bit)
24
- Added new cluster configuration file for cluster domain secret
25
- Import/export now use SSL instead of SSH
26
- Added support for showing estimated time when exporting an instance,
27
  see the ``ganeti-os-interface(7)`` manpage and look for
28
  ``EXP_SIZE_FD``
10 29

  
11 30

  
12 31
Version 2.1.3
b/README
1
Ganeti 2.1
1
Ganeti 2.2
2 2
==========
3 3

  
4 4
For installation instructions, read the INSTALL and the doc/install.html
b/doc/admin.rst
1244 1244
  Mon Oct 26 00:22:52 2009 adding instance instance1 to cluster config
1245 1245
  Mon Oct 26 00:22:52 2009  - INFO: Waiting for instance instance1 to sync disks.
1246 1246
1247
  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
1247
  Mon Oct 26 00:23:03 2009 creating os for instance instance1 on node node1
1248 1248
  Mon Oct 26 00:23:03 2009 * running the instance OS create scripts...
1249 1249
  Mon Oct 26 00:23:13 2009 * starting instance...
1250 1250
  node1#
......
1374 1374
recreated from it and if the instance disks have not been lost it
1375 1375
permits recovery from the loss of all master candidates.
1376 1376

  
1377
move-instance
1378
+++++++++++++
1379

  
1380
See :doc:`separate documentation for move-instance <move-instance>`.
1381

  
1382
.. TODO: document cluster-merge tool
1383

  
1377 1384

  
1378 1385
Other Ganeti projects
1379 1386
---------------------
b/doc/conf.py
38 38

  
39 39
# General information about the project.
40 40
project = u'Ganeti'
41
copyright = u'2006, 2007, 2008, 2009, Google Inc.'
41
copyright = u'2006, 2007, 2008, 2009, 2010, Google Inc.'
42 42

  
43 43
# The version info for the project you're documenting, acts as replacement for
44 44
# |version| and |release|, also used in various other places throughout the
b/man/footer.sgml
3 3
    <para>
4 4
      Report bugs to <ulink
5 5
      url="http://code.google.com/p/ganeti/"></ulink> or contact the
6
      developers using the ganeti mailing list
6
      developers using the Ganeti mailing list
7 7
      &lt;ganeti@googlegroups.com&gt;.
8 8
    </para>
9 9
  </refsect1>
......
83 83
    <title>COPYRIGHT</title>
84 84

  
85 85
    <para>
86
      Copyright (C) 2006, 2007, 2008, 2009 Google Inc. Permission is
86
      Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc. Permission is
87 87
      granted to copy, distribute and/or modify under the terms of the
88 88
      &gnu; General Public License as published by the Free Software
89 89
      Foundation; either version 2 of the License, or (at your option)
b/man/ganeti-cleaner.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>May 17, 2010</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
28 28
    &dhucpackage;
29 29

  
30 30
    &dhsection;
31
    <refmiscinfo>ganeti 2.0</refmiscinfo>
31
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
32 32
  </refmeta>
33 33
  <refnamediv>
34 34
    <refname>&dhpackage;</refname>
35 35

  
36
    <refpurpose>ganeti job queue cleaner</refpurpose>
36
    <refpurpose>Ganeti job queue cleaner</refpurpose>
37 37
  </refnamediv>
38 38
  <refsynopsisdiv>
39 39
    <cmdsynopsis>
b/man/ganeti-confd.sgml
1 1
<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
2 2

  
3 3
  <!-- Please adjust the date whenever revising the manpage. -->
4
  <!ENTITY dhdate      "<date>October 21, 2009</date>">
4
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
5 5
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
6 6
       allowed: see man(7), man(1). -->
7 7
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
26 26
    &dhucpackage;
27 27

  
28 28
    &dhsection;
29
    <refmiscinfo>ganeti 2.1</refmiscinfo>
29
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
30 30
  </refmeta>
31 31
  <refnamediv>
32 32
    <refname>&dhpackage;</refname>
33 33

  
34
    <refpurpose>ganeti conf daemon</refpurpose>
34
    <refpurpose>Ganeti conf daemon</refpurpose>
35 35
  </refnamediv>
36 36
  <refsynopsisdiv>
37 37
    <cmdsynopsis>
......
87 87
        The confd protocol is an HMAC authenticated json-encoded custom format,
88 88
        over UDP. A client library is provided to make it easy to write
89 89
        software to query confd. More information can be found in the Ganeti
90
        2.1 design doc, and an example usage can be seen in the (external) nbma
91
        daemon for ganeti.
90
        2.1 design doc, and an example usage can be seen in the (external) NBMA
91
        daemon for Ganeti.
92 92
      </para>
93 93
    </refsect2>
94 94

  
b/man/ganeti-masterd.sgml
1 1
<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
2 2

  
3 3
  <!-- Please adjust the date whenever revising the manpage. -->
4
  <!ENTITY dhdate      "<date>February 11, 2009</date>">
4
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
5 5
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
6 6
       allowed: see man(7), man(1). -->
7 7
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
19 19
    <copyright>
20 20
      <year>2008</year>
21 21
      <year>2009</year>
22
      <year>2010</year>
22 23
      <holder>Google Inc.</holder>
23 24
    </copyright>
24 25
    &dhdate;
......
27 28
    &dhucpackage;
28 29

  
29 30
    &dhsection;
30
    <refmiscinfo>ganeti 2.0</refmiscinfo>
31
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
31 32
  </refmeta>
32 33
  <refnamediv>
33 34
    <refname>&dhpackage;</refname>
34 35

  
35
    <refpurpose>ganeti master daemon</refpurpose>
36
    <refpurpose>Ganeti master daemon</refpurpose>
36 37
  </refnamediv>
37 38
  <refsynopsisdiv>
38 39
    <cmdsynopsis>
b/man/ganeti-noded.sgml
1 1
<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
2 2

  
3 3
  <!-- Please adjust the date whenever revising the manpage. -->
4
  <!ENTITY dhdate      "<date>February 11, 2009</date>">
4
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
5 5
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
6 6
       allowed: see man(7), man(1). -->
7 7
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
21 21
      <year>2007</year>
22 22
      <year>2008</year>
23 23
      <year>2009</year>
24
      <year>2010</year>
24 25
      <holder>Google Inc.</holder>
25 26
    </copyright>
26 27
    &dhdate;
......
29 30
    &dhucpackage;
30 31

  
31 32
    &dhsection;
32
    <refmiscinfo>ganeti 2.0</refmiscinfo>
33
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
33 34
  </refmeta>
34 35
  <refnamediv>
35 36
    <refname>&dhpackage;</refname>
36 37

  
37
    <refpurpose>ganeti node daemon</refpurpose>
38
    <refpurpose>Ganeti node daemon</refpurpose>
38 39
  </refnamediv>
39 40
  <refsynopsisdiv>
40 41
    <cmdsynopsis>
......
49 50

  
50 51
    <para>
51 52
      The <command>&dhpackage;</command> is the daemon which is
52
      responsible for the node functions in the ganeti system.
53
      responsible for the node functions in the Ganeti system.
53 54
    </para>
54 55

  
55 56
    <para>
56 57
      By default, in order to be able to support features such as node
57
      powercycling even on systems with a very damaged root disk, ganeti-noded
58
      mlocks itself in ram. You can disable this feature by passing in the
59
      <option>--no-mlock</option>.
58
      powercycling even on systems with a very damaged root disk,
59
      <command>ganeti-noded</command> locks itself in RAM using
60
      <citerefentry>
61
        <refentrytitle>mlockall</refentrytitle>
62
        <manvolnum>2</manvolnum>
63
      </citerefentry>. You can disable this feature by passing in the
64
      <option>--no-mlock</option> to the daemon.
60 65
    </para>
61 66

  
62 67
    <para>
......
75 80
    </para>
76 81

  
77 82
    <para>
78
      The ganeti-noded daemon listens to port 1811 TCP, on all interfaces, by
79
      default. This can be overridden by an entry in /etc/services or by
80
      passing the <option>-p</option> option. The <option>-b</option> option
81
      can be used to specify the address to bind to (defaults to 0.0.0.0).
83
      The <command>ganeti-noded</command> daemon listens to port 1811 TCP, on
84
      all interfaces, by default. This can be overridden by an entry the
85
      services database (<filename>/etc/services</filename>) or by passing the
86
      <option>-p</option> option. The <option>-b</option> option can be used to
87
      specify the address to bind to (defaults to 0.0.0.0).
82 88
    </para>
83 89

  
84 90
    <para>
85 91
      Ganeti noded communication is protected via SSL, with a key generated at
86 92
      cluster init time. This can be disabled with the
87
      <option>--no-ssl</option> option, or a different ssl key and certificate
93
      <option>--no-ssl</option> option, or a different SSL key and certificate
88 94
      can be specified using the <option>-K</option> and <option>-C</option>
89 95
      options.
90 96
    </para>
......
113 119
    <refsect2>
114 120
      <title>COMMUNICATION PROTOCOL</title>
115 121
      <para>
116
        Currently the master-node RPC is done using a simple json-RPC
117
        over HTTP(S).
122
        Currently the master-node RPC is done using a simple RPC protocol built
123
        using JSON over HTTP(S).
118 124
      </para>
119 125
    </refsect2>
120 126

  
b/man/ganeti-os-interface.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>October 02, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>7</manvolnum>">
......
31 31
    &dhucpackage;
32 32

  
33 33
    &dhsection;
34
    <refmiscinfo>ganeti 2.1</refmiscinfo>
34
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
35 35
  </refmeta>
36 36
  <refnamediv>
37 37
    <refname>ganeti-os-interface</refname>
38 38

  
39
    <refpurpose>specifications for guest OS types
40
    </refpurpose>
41

  
39
    <refpurpose>Specifications for guest OS types</refpurpose>
42 40
  </refnamediv>
43 41

  
44 42
  <refsect1>
......
75 73
        <varlistentry>
76 74
          <term>OS_API_VERSION</term>
77 75
          <listitem>
78
            <simpara>The OS api version that the rest of the
76
            <simpara>The OS API version that the rest of the
79 77
            environment conforms to.</simpara>
80 78
          </listitem>
81 79
        </varlistentry>
......
89 87
        <varlistentry>
90 88
          <term>INSTANCE_OS</term>
91 89
          <listitem>
92
            <simpara>The name os the instance's OS as Ganeti knows
90
            <simpara>The name of the instance's OS as Ganeti knows
93 91
            it. This can simplify the OS scripts by providing the same
94 92
            scripts under multiple names, and then the scripts can use
95 93
            this name to alter their behaviour.</simpara>
96
            <simpara>Under OS api 15 changing the script behavior based
94
            <simpara>With OS API 15 changing the script behavior based
97 95
            on this variable is deprecated: OS_VARIANT should be used
98 96
            instead (see below).</simpara>
99 97
          </listitem>
......
105 103
            must support all variants listed under its
106 104
            <filename>variants.list</filename> file, and may support more.
107 105
            Any more supported variants should be properly documented in the
108
            per-os documentation.</simpara>
106
            per-OS  documentation.</simpara>
109 107
          </listitem>
110 108
        </varlistentry>
111 109
        <varlistentry>
......
233 231
      <para>The <envar>INSTANCE_REINSTALL</envar> variable is set to '1' when
234 232
      this create request is reinstalling and existing instance, rather than
235 233
      creating one anew. This can be used, for example, to preserve some
236
      data in the old instance in an os-specific way.</para>
234
      data in the old instance in an OS-specific way.</para>
237 235

  
238 236
    </refsect2>
239 237

  
......
328 326
      <title>ganeti_api_version</title>
329 327
      <para>
330 328
        The <filename>ganeti_api_version</filename> file is a plain
331
        text file containing the version(s) of the guest OS api that
329
        text file containing the version(s) of the guest OS API that
332 330
        this OS definition complies with, one per line. The version
333 331
        documented by this man page is 15, so this file must contain
334 332
        the number 15 followed by a newline if only this version is
335
        supported. A script compatible more than one ganeti version
333
        supported. A script compatible with more than one Ganeti version
336 334
        should contain the most recent version first (i.e. 15),
337 335
        followed by the old version(s) (in this case 10 and/or 5).
338 336
      </para>
......
353 351
    <title>NOTES</title>
354 352

  
355 353
    <refsect2>
356
      <title>Retrocompatibility</title>
354
      <title>Backwards compatibility</title>
357 355

  
358 356
      <para>
359
        Ganeti 2.1 is compatible with both api version 10, and 15.
360
        In api version 10 the <filename>variants.list</filename>
357
        Ganeti 2.2 is compatible with both API version 10, and 15.
358
        In API version 10 the <filename>variants.list</filename>
361 359
        file is ignored and no OS_VARIANT environment variable is
362 360
        passed.
363 361
      </para>
......
394 392
        <title>Version 5 to 10</title>
395 393

  
396 394
        <para>
397
          The method os passing data has changed from command line
395
          The method for passing data has changed from command line
398 396
          options to environment variables, so scripts should be
399 397
          modified to use these. For an example of how this can be
400 398
          done in a way compatible with both versions, feel free to
b/man/ganeti-rapi.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>February 11, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
20 20
    <copyright>
21 21
      <year>2008</year>
22 22
      <year>2009</year>
23
      <year>2010</year>
23 24
      <holder>Google Inc.</holder>
24 25
    </copyright>
25 26
    &dhdate;
......
28 29
    &dhucpackage;
29 30

  
30 31
    &dhsection;
31
    <refmiscinfo>ganeti 2.0</refmiscinfo>
32
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
32 33
  </refmeta>
33 34
  <refnamediv>
34 35
    <refname>&dhpackage;</refname>
35 36

  
36
    <refpurpose>ganeti remote API daemon</refpurpose>
37
    <refpurpose>Ganeti remote API daemon</refpurpose>
37 38
  </refnamediv>
38 39
  <refsynopsisdiv>
39 40
    <cmdsynopsis>
......
112 113
    read-write rights, whereas the second user does only have read
113 114
    (query) rights, and as such is no different than not using
114 115
    authentication at all.</para>
116

  
117
    <para>More details (including on how to use hashed passwords) can be found
118
      in the Ganeti documentation.</para>
119

  
115 120
  </refsect1>
116 121
  &footer;
117 122

  
b/man/ganeti-watcher.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>February 11, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
21 21
      <year>2007</year>
22 22
      <year>2008</year>
23 23
      <year>2009</year>
24
      <year>2010</year>
24 25
      <holder>Google Inc.</holder>
25 26
    </copyright>
26 27
    &dhdate;
......
29 30
    &dhucpackage;
30 31

  
31 32
    &dhsection;
32
    <refmiscinfo>ganeti 2.0</refmiscinfo>
33
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
33 34
  </refmeta>
34 35
  <refnamediv>
35 36
    <refname>&dhpackage;</refname>
36 37

  
37
    <refpurpose>ganeti cluster watcher</refpurpose>
38
    <refpurpose>Ganeti cluster watcher</refpurpose>
38 39
  </refnamediv>
39 40
  <refsynopsisdiv>
40 41
    <cmdsynopsis>
......
80 81

  
81 82
      <para>
82 83
        In addition, it will execute any scripts which exist under the
83
        <quote>watcher</quote> directory in the ganeti hooks directory
84
        <quote>watcher</quote> directory in the Ganeti hooks directory
84 85
        (@SYSCONFDIR@/ganeti/hooks). This should be used for
85 86
        lightweight actions, like starting any extra daemons.
86 87
      </para>
b/man/ganeti.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>February 12, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>7</manvolnum>">
......
22 22
      <year>2007</year>
23 23
      <year>2008</year>
24 24
      <year>2009</year>
25
      <year>2010</year>
25 26
      <holder>Google Inc.</holder>
26 27
    </copyright>
27 28
    &dhdate;
......
30 31
    &dhucpackage;
31 32

  
32 33
    &dhsection;
33
    <refmiscinfo>ganeti 2.0</refmiscinfo>
34
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
34 35
  </refmeta>
35 36
  <refnamediv>
36 37
    <refname>&dhpackage;</refname>
......
51 52
    <title>DESCRIPTION</title>
52 53

  
53 54
    <para>
54
      The ganeti software manages physical nodes and virtual instances
55
      The Ganeti software manages physical nodes and virtual instances
55 56
      of a cluster based on a virtualization software. The current
56
      version (2.0) supports Xen 3.0 (also tested with 3.1) and KVM
57
      hypervisors.
57
      version (2.2) supports Xen 3.x and KVM (72 or above) as hypervisors.
58 58
    </para>
59 59

  
60 60
  </refsect1>
......
134 134
          <varlistentry>
135 135
            <term>offline</term>
136 136
            <listitem>
137
              <para>These nodes are still recorder in the ganeti
137
              <para>These nodes are still recorded in the Ganeti
138 138
              configuration, but except for the master daemon startup
139 139
              voting procedure, they are not actually contacted by the
140 140
              master. This state was added in order to allow broken
b/man/gnt-backup.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>February 11, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
30 30
    &dhucpackage;
31 31

  
32 32
    &dhsection;
33
    <refmiscinfo>ganeti 2.1</refmiscinfo>
33
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
34 34
  </refmeta>
35 35
  <refnamediv>
36 36
    <refname>&dhpackage;</refname>
37 37

  
38
    <refpurpose>ganeti instance import/export</refpurpose>
38
    <refpurpose>Ganeti instance import/export</refpurpose>
39 39
  </refnamediv>
40 40
  <refsynopsisdiv>
41 41
    <cmdsynopsis>
......
50 50

  
51 51
    <para>
52 52
      The <command>&dhpackage;</command> is used for importing and exporting
53
      instances and their configuration from a ganeti system. It is useful for
54
      backing instances up and also to migrate them between clusters.
53
      instances and their configuration from a Ganeti system. It is useful for
54
      backing up instances and also to migrate them between clusters.
55 55
    </para>
56 56

  
57 57
  </refsect1>
b/man/gnt-cluster.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>February 12, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
30 30
    &dhucpackage;
31 31

  
32 32
    &dhsection;
33
    <refmiscinfo>ganeti 2.0</refmiscinfo>
33
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
34 34
  </refmeta>
35 35
  <refnamediv>
36 36
    <refname>&dhpackage;</refname>
37 37

  
38
    <refpurpose>ganeti administration, cluster-wide</refpurpose>
38
    <refpurpose>Ganeti administration, cluster-wide</refpurpose>
39 39
  </refnamediv>
40 40
  <refsynopsisdiv>
41 41
    <cmdsynopsis>
......
50 50

  
51 51
    <para>
52 52
      The <command>&dhpackage;</command> is used for cluster-wide
53
      administration in the ganeti system.
53
      administration in the Ganeti system.
54 54
    </para>
55 55

  
56 56
  </refsect1>
......
293 293

  
294 294
      <para>
295 295
        The <option>-g</option> option will let you specify a volume group
296
        different than 'xenvg' for ganeti to use when creating instance disks.
296
        different than "xenvg" for Ganeti to use when creating instance disks.
297 297
        This volume group must have the same name on all nodes. Once the
298 298
        cluster is initialized this can be altered by using the
299 299
        <command>modify</command> command. If you don't want to use lvm
......
564 564
      <para>
565 565
        The <option>--no-voting</option> option skips the remote node agreement
566 566
        checks. This is dangerous, but necessary in some cases (for example
567
        failing over the master role in a 2 node cluster with the original master
568
        down). If the original master then comes up, it won't be able to start
569
        its master daemon because it won't have enough votes, but so won't the
570
        new master, if the master daemon ever needs a restart. You can pass
571
        --no-voting to ganeti-masterd on the new master to solve this problem,
572
        and gnt-cluster redist-conf to make sure the cluster is consistent again.
567
        failing over the master role in a 2 node cluster with the original
568
        master down). If the original master then comes up, it won't be able to
569
        start its master daemon because it won't have enough votes, but so
570
        won't the new master, if the master daemon ever needs a restart. You
571
        can pass <option>--no-voting</option> to
572
        <command>ganeti-masterd</command> on the new master to solve this
573
        problem, and run <command>gnt-cluster redist-conf</command> to make
574
        sure the cluster is consistent again.
573 575
      </para>
574 576

  
575 577
    </refsect2>
......
900 902
      </para>
901 903

  
902 904
      <para>
903
        If the <option>--no-nplus1-mem</option> option is given, ganeti won't
905
        If the <option>--no-nplus1-mem</option> option is given, Ganeti won't
904 906
        check whether if it loses a node it can restart all the instances on
905 907
        their secondaries (and report an error otherwise).
906 908
      </para>
b/man/gnt-debug.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>February 12, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
22 22
      <year>2007</year>
23 23
      <year>2008</year>
24 24
      <year>2009</year>
25
      <year>2010</year>
25 26
      <holder>Google Inc.</holder>
26 27
    </copyright>
27 28
    &dhdate;
......
30 31
    &dhucpackage;
31 32

  
32 33
    &dhsection;
33
    <refmiscinfo>ganeti 2.0</refmiscinfo>
34
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
34 35
  </refmeta>
35 36
  <refnamediv>
36 37
    <refname>&dhpackage;</refname>
37 38

  
38
    <refpurpose>debug commands</refpurpose>
39
    <refpurpose>Debug commands</refpurpose>
39 40
  </refnamediv>
40 41
  <refsynopsisdiv>
41 42
    <cmdsynopsis>
......
50 51

  
51 52
    <para>
52 53
      The <command>&dhpackage;</command> is used for debugging the
53
      ganeti system.
54
      Ganeti system.
54 55
    </para>
55 56

  
56 57
  </refsect1>
......
101 102
      </para>
102 103

  
103 104
      <para>
104
        This build of ganeti will look for iallocator scripts in the
105
        This build of Ganeti will look for iallocator scripts in the
105 106
        following directories: <filename
106 107
        class="directory">@CUSTOM_IALLOCATOR_SEARCH_PATH@</filename>;
107 108
        for more details about this framework, see the HTML or PDF
b/man/gnt-instance.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>January 22, 2010</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
31 31
    &dhucpackage;
32 32

  
33 33
    &dhsection;
34
    <refmiscinfo>ganeti 2.0</refmiscinfo>
34
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
35 35
  </refmeta>
36 36
  <refnamediv>
37 37
    <refname>&dhpackage;</refname>
38 38

  
39
    <refpurpose>ganeti instance administration</refpurpose>
39
    <refpurpose>Ganeti instance administration</refpurpose>
40 40
  </refnamediv>
41 41
  <refsynopsisdiv>
42 42
    <cmdsynopsis>
......
51 51

  
52 52
    <para>
53 53
      The <command>&dhpackage;</command> is used for instance
54
      administration in the ganeti system.
54
      administration in the Ganeti system.
55 55
    </para>
56 56

  
57 57
  </refsect1>
......
611 611
                <quote>none</quote>, <quote>user</quote> or
612 612
                <quote>pool</quote>. Under <quote>none</quote>, the
613 613
                default, nothing is done and instances are run as
614
                the ganeti daemon user (normally root).
614
                the Ganeti daemon user (normally root).
615 615
                </simpara>
616 616

  
617 617
                <simpara>Under <quote>user</quote> kvm will drop
......
633 633
              <listitem>
634 634
                <simpara>Valid for the KVM hypervisor.</simpara>
635 635

  
636
                <simpara>Under security model <quote>user</quote> the username to
637
                run the instance under. It must be a valid username
636
                <simpara>Under security model <quote>user</quote> the username
637
                to run the instance under. It must be a valid username
638 638
                existing on the host.
639 639
                </simpara>
640 640
                <simpara>Cannot be set under security model <quote>none</quote>
......
702 702
                instance in a chroot directory.
703 703
                </simpara>
704 704
                <para>If it is set to <quote>true</quote>, an empty directory
705
                is created before starting the instance and its path is passed via
706
                the -chroot flag to kvm.
705
                is created before starting the instance and its path is passed
706
                via the <option>-chroot</option> flag to kvm.
707 707
                The directory is removed when the instance is stopped.
708 708
                </para>
709 709

  
......
1152 1152
            <varlistentry>
1153 1153
              <term>ip</term>
1154 1154
              <listitem>
1155
                <simpara>the ip address ganeti recognizes as associated with
1155
                <simpara>the ip address Ganeti recognizes as associated with
1156 1156
                the first instance interface</simpara>
1157 1157
              </listitem>
1158 1158
            </varlistentry>
......
2411 2411
        <para>
2412 2412
          If the <option>--cleanup</option> option is passed, the
2413 2413
          operation changes from migration to attempting recovery from
2414
          a failed previous migration. In this mode, ganeti checks if
2414
          a failed previous migration. In this mode, Ganeti checks if
2415 2415
          the instance runs on the correct node (and updates its
2416 2416
          configuration if not) and ensures the instances's disks are
2417 2417
          configured correctly. In this mode, the
b/man/gnt-job.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>February 12, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
28 28
    &dhucpackage;
29 29

  
30 30
    &dhsection;
31
    <refmiscinfo>ganeti 2.0</refmiscinfo>
31
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
32 32
  </refmeta>
33 33
  <refnamediv>
34 34
    <refname>&dhpackage;</refname>
35 35

  
36
    <refpurpose>job commands</refpurpose>
36
    <refpurpose>Job commands</refpurpose>
37 37
  </refnamediv>
38 38
  <refsynopsisdiv>
39 39
    <cmdsynopsis>
b/man/gnt-node.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>February 12, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
30 30
    &dhucpackage;
31 31

  
32 32
    &dhsection;
33
    <refmiscinfo>ganeti 2.0</refmiscinfo>
33
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
34 34
  </refmeta>
35 35
  <refnamediv>
36 36
    <refname>&dhpackage;</refname>
37 37

  
38
    <refpurpose>node administration</refpurpose>
38
    <refpurpose>Node administration</refpurpose>
39 39
  </refnamediv>
40 40
  <refsynopsisdiv>
41 41
    <cmdsynopsis>
......
50 50

  
51 51
    <para>
52 52
      The <command>&dhpackage;</command> is used for managing the
53
      (physical) nodes in the ganeti system.
53
      (physical) nodes in the Ganeti system.
54 54
    </para>
55 55

  
56 56
  </refsect1>
......
75 75
        This command is used to join a new node to the cluster. You
76 76
        will have to provide the password for root of the node to be
77 77
        able to add the node in the cluster. The command needs to be
78
        run on the ganeti master.
78
        run on the Ganeti master.
79 79
      </para>
80 80

  
81 81
      <para>
......
992 992
        This commands (tries to) forcefully reboot a node. It is a
993 993
        command that can be used if the node environemnt is broken,
994 994
        such that the admin can no longer login over ssh, but the
995
        ganeti node daemon is still working.
995
        Ganeti node daemon is still working.
996 996
      </para>
997 997

  
998 998
      <para>
b/man/gnt-os.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>February 12, 2009</date>">
5
  <!ENTITY dhdate      "<date>June 08, 2010</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
31 31
    &dhucpackage;
32 32

  
33 33
    &dhsection;
34
    <refmiscinfo>ganeti 2.0</refmiscinfo>
34
    <refmiscinfo>Ganeti 2.2</refmiscinfo>
35 35
  </refmeta>
36 36
  <refnamediv>
37 37
    <refname>&dhpackage;</refname>
38 38

  
39
    <refpurpose>instance operating system administration</refpurpose>
39
    <refpurpose>Instance operating system administration</refpurpose>
40 40
  </refnamediv>
41 41
  <refsynopsisdiv>
42 42
    <cmdsynopsis>
......
52 52
    <para>
53 53
      The <command>&dhpackage;</command> is used for managing the list
54 54
      of available operating system flavours for the instances in the
55
      ganeti cluster.
55
      Ganeti cluster.
56 56
    </para>
57 57

  
58 58
  </refsect1>

Also available in: Unified diff