Revision c190e817

b/lib/cmdlib.py
3197 3197
  REQ_BGL = False
3198 3198

  
3199 3199
  _SIMPLE_FIELDS = ["name", "serial_no", "ctime", "mtime", "uuid",
3200
                    "master_candidate", "offline", "drained"]
3200
                    "master_candidate", "offline", "drained",
3201
                    "master_capable", "vm_capable"]
3201 3202

  
3202 3203
  _FIELDS_DYNAMIC = utils.FieldSet(
3203 3204
    "dtotal", "dfree",
......
10244 10245
        "drained": ninfo.drained,
10245 10246
        "master_candidate": ninfo.master_candidate,
10246 10247
        "group": ninfo.group,
10248
        "master_capable": ninfo.master_capable,
10249
        "vm_capable": ninfo.vm_capable,
10247 10250
        }
10248 10251

  
10249 10252
      if not (ninfo.offline or ninfo.drained):
b/lib/rapi/rlib2.py
69 69
            "ctotal", "cnodes", "csockets",
70 70
            "pip", "sip", "role",
71 71
            "pinst_list", "sinst_list",
72
            "master_capable", "vm_capable",
72 73
            ] + _COMMON_FIELDS
73 74

  
74 75
_NR_DRAINED = "drained"
b/man/gnt-node.sgml
524 524
              </para>
525 525
            </listitem>
526 526
          </varlistentry>
527
          <varlistentry>
528
            <term>master_capable</term>
529
            <listitem>
530
              <para>whether the node can become a master candidate</para>
531
            </listitem>
532
          </varlistentry>
533
          <varlistentry>
534
            <term>vm_capable</term>
535
            <listitem>
536
              <para>whether the node can host instances</para>
537
            </listitem>
538
          </varlistentry>
527 539
        </variablelist>
528 540
      </para>
529 541

  
b/scripts/gnt-node
77 77
  "master": "IsMaster",
78 78
  "offline": "Offline", "drained": "Drained",
79 79
  "role": "Role",
80
  "ctime": "CTime", "mtime": "MTime", "uuid": "UUID"
80
  "ctime": "CTime", "mtime": "MTime", "uuid": "UUID",
81
  "master_capable": "MasterCapable", "vm_capable": "VMCapable",
81 82
  }
82 83

  
83 84

  
......
251 252
      val = row[idx]
252 253
      if field in list_type_fields:
253 254
        val = ",".join(val)
254
      elif field in ('master', 'master_candidate', 'offline', 'drained'):
255
      elif field in ('master', 'master_candidate', 'offline', 'drained',
256
                     'master_capable', 'vm_capable'):
255 257
        if val:
256 258
          val = 'Y'
257 259
        else:

Also available in: Unified diff