Revision 77031881

b/doc/iallocator.rst
72 72

  
73 73
version
74 74
  the version of the protocol; this document
75
  specifies version 1
75
  specifies version 2
76 76

  
77 77
cluster_name
78 78
  the cluster name
......
80 80
cluster_tags
81 81
  the list of cluster tags
82 82

  
83
enabled_hypervisors
84
  the list of enabled hypervisors
85

  
83 86
request
84 87
  a dictionary containing the request data:
85 88

  
......
148 151
  tags
149 152
    the list of the instance's tags
150 153

  
154
  hypervisor
155
    the hypervisor of this instance
156

  
151 157

  
152 158
  If the request is of type relocate, then there is one more entry in
153 159
  the request dictionary, named ``relocate_from``, and it contains a
......
160 166
  cluster, indexed by instance name; the contents are similar to the
161 167
  instance definitions for the allocate mode, with the addition of:
162 168

  
163
  should_run
169
  admin_up
164 170
    if this instance is set to run (but not the actual status of the
165 171
    instance)
166 172

  
......
200 206
  tags
201 207
    list with the tags of the node
202 208

  
209
  master_candidate:
210
    a boolean flag denoting whether this node is a master candidate
211

  
212
  drained:
213
    a boolean flag denoting whether this node is being drained
214

  
215
  offline:
216
    a boolean flag denoting whether this node is offline
217

  
218
  i_pri_memory:
219
    total memory required by primary instances
220

  
221
  i_pri_up_memory:
222
    total memory required by running primary instances
223

  
224
  No allocations should be made on nodes having either the ``drained``
225
  or ``offline`` flags set. More details about these of node status
226
  flags is available in the manpage *ganeti(7)*.
227

  
228

  
203 229
Respone message
204 230
~~~~~~~~~~~~~~~
205 231

  
b/doc/install.rst
1 1
Ganeti installation tutorial
2 2
============================
3 3

  
4
Documents Ganeti version 2.0.
4
Documents Ganeti version 2.0
5 5

  
6 6
.. contents::
7 7

  
b/lib/cmdlib.py
6587 6587
    cluster_info = cfg.GetClusterInfo()
6588 6588
    # cluster data
6589 6589
    data = {
6590
      "version": 1,
6590
      "version": constants.IALLOCATOR_VERSION,
6591 6591
      "cluster_name": cfg.GetClusterName(),
6592 6592
      "cluster_tags": list(cluster_info.GetTags()),
6593 6593
      "enabled_hypervisors": list(cluster_info.enabled_hypervisors),
b/lib/constants.py
402 402
NV_DRBDLIST = "drbd-list"
403 403

  
404 404
# Allocator framework constants
405
IALLOCATOR_VERSION = 2
405 406
IALLOCATOR_DIR_IN = "in"
406 407
IALLOCATOR_DIR_OUT = "out"
407 408
IALLOCATOR_MODE_ALLOC = "allocate"

Also available in: Unified diff