qa_rapi: Fix indentation error

[ganeti-local] / man / gnt-node.sgml

diff --git a/man/gnt-node.sgml b/man/gnt-node.sgml
index c1980f2..ae4720b 100644 (file)
--- a/man/gnt-node.sgml
+++ b/man/gnt-node.sgml
@@ -2,7 +2,7 @@
 
   <!-- Fill in your name for FIRSTNAME and SURNAME. -->
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>February 12, 2009</date>">
+  <!ENTITY dhdate      "<date>June 08, 2010</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
@@ -30,12 +30,12 @@
     &dhucpackage;
 
     &dhsection;
-    <refmiscinfo>ganeti 2.0</refmiscinfo>
+    <refmiscinfo>Ganeti 2.2</refmiscinfo>
   </refmeta>
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>node administration</refpurpose>
+    <refpurpose>Node administration</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -50,7 +50,7 @@
 
     <para>
       The <command>&dhpackage;</command> is used for managing the
-      (physical) nodes in the ganeti system.
+      (physical) nodes in the Ganeti system.
     </para>
 
   </refsect1>
@@ -75,7 +75,7 @@
         This command is used to join a new node to the cluster. You
         will have to provide the password for root of the node to be
         able to add the node in the cluster. The command needs to be
-        run on the ganeti master.
+        run on the Ganeti master.
       </para>
 
       <para>
@@ -107,7 +107,7 @@
         Example:
         <screen>
 # gnt-node add node5.example.com
-# gnt-node add -s 192.168.44.5 node5.example.com
+# gnt-node add -s 192.0.2.5 node5.example.com
         </screen>
       </para>
     </refsect2>
@@ -148,12 +148,12 @@
           <arg>--iallocator <replaceable>NAME</replaceable></arg>
           <arg>--new-secondary <replaceable>destination_node</replaceable></arg>
         </group>
-        <arg choice="req"><replaceable>node</replaceable></arg>
+        <arg choice="req" rep="repeat"><replaceable>node</replaceable></arg>
       </cmdsynopsis>
 
       <para>
         This command will move all secondary instances away from the
-        given node. It works only for instances having a drbd disk
+        given node(s). It works only for instances having a drbd disk
         template.
       </para>
 
@@ -253,6 +253,8 @@
         <arg>--units=<replaceable>UNITS</replaceable></arg>
         <arg>-o <replaceable>[+]FIELD,...</replaceable></arg>
         <sbr>
+        <arg>--roman</arg>
+        <sbr>
         <arg rep="repeat">node</arg>
       </cmdsynopsis>
 
@@ -286,6 +288,12 @@
       </para>
 
       <para>
+        Passing the <option>--roman</option> option gnt-node list will try to
+        output some of its fields in a latin-friendly way. This is not the
+        default for backwards compatibility.
+      </para>
+
+      <para>
         The <option>-o</option> option takes a comma-separated list of
         output fields. The available fields and their meaning are:
         <variablelist>
@@ -563,6 +571,7 @@
         <command>migrate</command>
         <arg>-f</arg>
         <arg>--non-live</arg>
+        <arg>--migration-mode=live|non-live</arg>
         <arg choice="req"><replaceable>node</replaceable></arg>
       </cmdsynopsis>
 
@@ -574,8 +583,9 @@
 
       <para>
         As for the <command>gnt-instance migrate</command> command,
-        the <option>--no-live</option> option can be given to do a
-        non-live migration.
+        the options <option>--no-live</option>
+        and <option>--migration-mode</option> can be given to
+        influence the migration type.
       </para>
 
       <para>
@@ -596,6 +606,7 @@
         <arg>--master-candidate=<option>yes|no</option></arg>
         <arg>--drained=<option>yes|no</option></arg>
         <arg>--offline=<option>yes|no</option></arg>
+        <arg>--auto-promote</arg>
         <arg choice="req"><replaceable>node</replaceable></arg>
       </cmdsynopsis>
 
@@ -610,10 +621,15 @@
       </para>
 
       <para>
-        In case a node is demoted from the master candidate role, but
-        there are not enough new nodes for this case, the operation
-        will be refused. To override this check, pass the
-        <option>--force</option> option.
+        In case a node is demoted from the master candidate role, the
+        operation will be refused unless you pass
+        the <option>--auto-promote</option> option. This option will
+        cause the operation to lock all cluster nodes (thus it will
+        not be able to run in parallel with most other jobs), but it
+        allows automated maintenance of the cluster candidate pool. If
+        locking all cluster node is too expensive, another option is
+        to promote manually another node to master candidate before
+        demoting the current one.
       </para>
 
       <para>
@@ -969,7 +985,7 @@ node2 lvm-pv /dev/sdb1 698.6G   0M 698.6G Y
 
       <cmdsynopsis>
         <command>powercycle</command>
-        <arg><option>--confirm</option></arg>
+        <arg><option>--yes</option></arg>
         <arg><option>--force</option></arg>
         <arg choice="req"><replaceable>node</replaceable></arg>
       </cmdsynopsis>
@@ -978,7 +994,7 @@ node2 lvm-pv /dev/sdb1 698.6G   0M 698.6G Y
         This commands (tries to) forcefully reboot a node. It is a
         command that can be used if the node environemnt is broken,
         such that the admin can no longer login over ssh, but the
-        ganeti node daemon is still working.
+        Ganeti node daemon is still working.
       </para>
 
       <para>