Revision d8a4b51d

b/lib/cli.py
167 167
                           help="Print sizes in human readable format")
168 168

  
169 169
FIELDS_OPT = make_option("-o", "--output", dest="output", action="store",
170
                         type="string", help="Select output fields",
170
                         type="string", help="Comma separated list of"
171
                         " output fields",
171 172
                         metavar="FIELDS")
172 173

  
173 174
FORCE_OPT = make_option("-f", "--force", dest="force", action="store_true",
b/man/gnt-instance.sgml
436 436
                </simpara>
437 437
              </listitem>
438 438
            </varlistentry>
439
            <varlistentry>
440
              <term>sda_size</term>
441
              <listitem>
442
                <simpara>the size of the instance's first disk</simpara>
443
              </listitem>
444
            </varlistentry>
445
            <varlistentry>
446
              <term>sdb_size</term>
447
              <listitem>
448
                <simpara>the size of the instance's second disk</simpara>
449
              </listitem>
450
            </varlistentry>
451
            <varlistentry>
452
              <term>vcpus</term>
453
              <listitem>
454
                <simpara>the number of VCPUs allocated to the
455
                instance</simpara>
456
              </listitem>
457
            </varlistentry>
439 458
          </variablelist>
440 459
        </para>
441 460

  
b/man/gnt-node.sgml
232 232
            </listitem>
233 233
          </varlistentry>
234 234
          <varlistentry>
235
            <term>pinst</term>
235
            <term>pinst_cnt</term>
236 236
            <listitem>
237 237
              <simpara>the number of instances having this node as
238 238
              primary</simpara>
239 239
            </listitem>
240 240
          </varlistentry>
241 241
          <varlistentry>
242
            <term>sinst</term>
242
            <term>pinst_list</term>
243
            <listitem>
244
              <simpara>the list of instances having this node as
245
              primary, comma separated</simpara>
246
            </listitem>
247
          </varlistentry>
248
          <varlistentry>
249
            <term>sinst_cnt</term>
243 250
            <listitem>
244 251
              <simpara>the number of instances having this node as a
245 252
              secondary node</simpara>
246 253
            </listitem>
247 254
          </varlistentry>
248 255
          <varlistentry>
256
            <term>sinst_list</term>
257
            <listitem>
258
              <simpara>the list of instances having this node as a
259
              secondary node, comma separated</simpara>
260
            </listitem>
261
          </varlistentry>
262
          <varlistentry>
249 263
            <term>pip</term>
250 264
            <listitem>
251 265
              <simpara>the primary ip of this node (used for cluster
......
296 310
              allocations</simpara>
297 311
            </listitem>
298 312
          </varlistentry>
313
          <varlistentry>
314
            <term>bootid</term>
315
            <listitem>
316
              <simpara>the node bootid value; this is a linux specific
317
              feature that assigns a new UUID to the node at each boot
318
              and can be use to detect node reboots (by tracking
319
              changes in this value)</simpara>
320
            </listitem>
321
          </varlistentry>
299 322
        </variablelist>
300 323
      </para>
301 324

  
b/scripts/gnt-instance
811 811
           "Show information on the specified instance"),
812 812
  'list': (ListInstances, ARGS_NONE,
813 813
           [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT],
814
           "", "Lists the instances and their status"),
814
           "", "Lists the instances and their status. The available fields"
815
           " are (see the man page for details): oper_state, oper_ram,"
816
           " name, os, pnode, snodes, admin_state, admin_ram, disk_template,"
817
           " ip, mac, bridge, sda_size, sdb_size, vcpus. The default field"
818
           " list is (in order): name, os, pnode, admin_state, oper_state,"
819
           " oper_ram."),
815 820
  'reinstall': (ReinstallInstance, ARGS_ONE, [DEBUG_OPT, FORCE_OPT, os_opt],
816 821
                "[-f] <instance>", "Reinstall the instance"),
817 822
  'remove': (RemoveInstance, ARGS_ONE,
b/scripts/gnt-node
300 300
           "[<node_name>...]", "Show information about the node(s)"),
301 301
  'list': (ListNodes, ARGS_NONE,
302 302
           [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT],
303
           "", "Lists the nodes in the cluster"),
303
           "", "Lists the nodes in the cluster. The available fields"
304
           " are (see the man page for details): name, pinst_cnt, pinst_list,"
305
           " sinst_cnt, sinst_list, pip, sip, dtotal, dfree, mtotal, mnode,"
306
           " mfree, bootid. The default field list is (in order): name,"
307
           " dtotal, dfree, mtotal, mnode, mfree, pinst_cnt, sinst_cnt."),
304 308
  'remove': (RemoveNode, ARGS_ONE, [DEBUG_OPT],
305 309
             "<node_name>", "Removes a node from the cluster"),
306 310
  'volumes': (ListVolumes, ARGS_ANY,

Also available in: Unified diff