Commit b32d6567 authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Merge branch 'devel-2.3'



Conflicts:
	doc/design-2.3.rst
  This was a minor conflict with some rewording of a phrase

	lib/client/gnt_instance.py
  Removed _FormatParameterDict function as it was moved to cli.py in
  master branch
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 8f8ce6d1 f78f971e
......@@ -77,7 +77,8 @@ The ``alloc_policy`` attribute can have the following values:
- last_resort: the node group should not be used for instance
allocations, unless this would be the only way to have the operation
succeed.
succeed. Prioritization among groups in this state will be deferred to
the iallocator plugin that's being used.
- preferred: the node group can be used freely for allocation of
instances (this is the default state for newly created node
......
......@@ -1209,6 +1209,7 @@ def ShowInstanceConfig(opts, args):
for idx, (ip, mac, mode, link) in enumerate(instance["nics"]):
buf.write(" - nic/%d: MAC: %s, IP: %s, mode: %s, link: %s\n" %
(idx, mac, ip, mode, link))
buf.write(" Disk template: %s\n" % instance["disk_template"])
buf.write(" Disks:\n")
for idx, device in enumerate(instance["disks"]):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment