[PATCH stable-2.15] Support force option for deactivate disks on RAPI

['Klaus Aehlig' via ganeti-devel]

Signed-off-by: Klaus Aehlig <aeh...@google.com>
---
 lib/rapi/client.py | 3 ++-
 lib/rapi/rlib2.py  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/rapi/client.py b/lib/rapi/client.py
index 65f82ab..b6ef576 100644
--- a/lib/rapi/client.py
+++ b/lib/rapi/client.py
@@ -964,7 +964,7 @@ class GanetiRapiClient(object): # pylint: disable=R0904
                              ("/%s/instances/%s/activate-disks" %
                               (GANETI_RAPI_VERSION, instance)), query, None)
 
-  def DeactivateInstanceDisks(self, instance, reason=None):
+  def DeactivateInstanceDisks(self, instance, reason=None, force=False):
     """Deactivates an instance's disks.
 
     @type instance: string
@@ -976,6 +976,7 @@ class GanetiRapiClient(object): # pylint: disable=R0904
 
     """
     query = []
+    _AppendForceIf(query, force)
     _AppendReason(query, reason)
     return self._SendRequest(HTTP_PUT,
                              ("/%s/instances/%s/deactivate-disks" %
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 8fee8fb..34b4124 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1395,6 +1395,7 @@ class 
R_2_instances_name_deactivate_disks(baserlib.OpcodeResource):
     """
     return ({}, {
       "instance_name": self.items[0],
+      "force": self.useForce(),
       })
 
 
-- 
2.6.0.rc2.230.g3dd15c0