Revision 4337cf1b

b/doc/iallocator.sgml
320 320
                </listitem>
321 321
              </varlistentry>
322 322
              <varlistentry>
323
                <term>total_cpus</term>
324
                <listitem>
325
                  <simpara>the physical number of CPUs present on the
326
                  machine; depending on the hypervisor, this might or
327
                  might not be equal to how many CPUs the node
328
                  operating system sees;</simpara>
329
                </listitem>
330
              </varlistentry>
331
              <varlistentry>
323 332
                <term>primary_ip</term>
324 333
                <listitem>
325 334
                  <simpara>the primary IP address of the
b/lib/cmdlib.py
4938 4938
        raise errors.OpExecError("Can't get data for node %s" % nname)
4939 4939
      remote_info = node_data[nname]
4940 4940
      for attr in ['memory_total', 'memory_free', 'memory_dom0',
4941
                   'vg_size', 'vg_free']:
4941
                   'vg_size', 'vg_free', 'cpu_total']:
4942 4942
        if attr not in remote_info:
4943 4943
          raise errors.OpExecError("Node '%s' didn't return attribute '%s'" %
4944 4944
                                   (nname, attr))
......
4967 4967
        "free_disk": remote_info['vg_free'],
4968 4968
        "primary_ip": ninfo.primary_ip,
4969 4969
        "secondary_ip": ninfo.secondary_ip,
4970
        "total_cpus": remote_info['cpu_total'],
4970 4971
        }
4971 4972
      node_results[nname] = pnr
4972 4973
    data["nodes"] = node_results

Also available in: Unified diff