Commit 2b1ac224 authored by Guido Trotter's avatar Guido Trotter
Browse files

Merge branch 'next' into branch-2.1

* next:
  gnt-cluster(8) fix --backend-parameters opt name
  LUQueryInstances: fix querying for nic data
  Specify the object type in two docstring
parents 7b381438 280b79b3
......@@ -3508,11 +3508,20 @@ class LUQueryInstances(NoHooksLU):
elif field == "disk_template":
val = instance.disk_template
elif field == "ip":
val = instance.nics[0].ip
if instance.nics:
val = instance.nics[0].ip
else:
val = None
elif field == "bridge":
val = instance.nics[0].bridge
if instance.nics:
val = instance.nics[0].bridge
else:
val = None
elif field == "mac":
val = instance.nics[0].mac
if instance.nics:
val = instance.nics[0].mac
else:
val = None
elif field == "sda_size" or field == "sdb_size":
idx = ord(field[2]) - ord('a')
try:
......
......@@ -832,7 +832,7 @@ class Cluster(TaggableObject):
def FillHV(self, instance):
"""Fill an instance's hvparams dict.
@type instance: object
@type instance: L{objects.Instance}
@param instance: the instance parameter to fill
@rtype: dict
@return: a copy of the instance's hvparams with missing keys filled from
......@@ -845,7 +845,7 @@ class Cluster(TaggableObject):
def FillBE(self, instance):
"""Fill an instance's beparams dict.
@type instance: object
@type instance: L{objects.Instance}
@param instance: the instance parameter to fill
@rtype: dict
@return: a copy of the instance's beparams with missing keys filled from
......
......@@ -373,7 +373,7 @@
</para>
<para>
The <option>--backend</option> option allows you to set
The <option>--backend-parameters</option> option allows you to set
the default backend parameters for the cluster. The parameter
format is a comma-separated list of key=value pairs with the
following supported keys:
......
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