Merge branch 'stable-2.10' into stable-2.11
authorHrvoje Ribicic <riba@google.com>
Thu, 3 Sep 2015 12:10:34 +0000 (14:10 +0200)
committerHrvoje Ribicic <riba@google.com>
Thu, 3 Sep 2015 12:36:05 +0000 (14:36 +0200)
* stable-2.10
  (no changes)

* stable-2.9
  Document quoting of special values in key-value parameters
  replace-disks: fix --ignore-ipolicy

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

lib/cmdlib/instance_storage.py
man/ganeti.rst

index 610ee54..215db32 100644 (file)
@@ -2076,7 +2076,7 @@ class TLReplaceDisks(Tasklet):
       cluster = self.cfg.GetClusterInfo()
       ipolicy = ganeti.masterd.instance.CalculateGroupIPolicy(cluster,
                                                               new_group_info)
-      CheckTargetNodeIPolicy(self, ipolicy, self.instance,
+      CheckTargetNodeIPolicy(self.lu, ipolicy, self.instance,
                              self.remote_node_info, self.cfg,
                              ignore=self.ignore_ipolicy)
 
index d46fb2d..d6c68ec 100644 (file)
@@ -357,6 +357,13 @@ behaviour)::
   # gnt-instance modify -H kernel_path=an\\,example instance1
   # gnt-instance modify -H kernel_path='an\,example' instance1
 
+Additionally, the following non-string parameters can be passed. To
+pass the boolean value ``True``, only mention the key (leaving out the
+equality sign and any value). To pass the boolean value ``False``,
+again only mention the key, but prefix it with ``no_``. To pass the
+special ``None`` value, again only mention the key, but prefix it with
+a single ``-`` sign.
+
 Query filters
 ~~~~~~~~~~~~~