From 0a2bab1d4d01df99bc9594f3f055ad99584949aa Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Wed, 27 Mar 2019 11:16:15 -0400
Subject: Fix shell upload-to-image with no volume type

Upload-to-image would error after launching
the operation if the volume type is None.

Closes-Bug: #1821818
Change-Id: I015e0ddfa98d62f25334e2df5effaee72a3988ab
(cherry picked from commit 274fa111696783e846561d12f670967ed01ebcbc)
---
 cinderclient/v2/volumes.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cinderclient/v2')

diff --git a/cinderclient/v2/volumes.py b/cinderclient/v2/volumes.py
index 18a6e25..c16b3a0 100644
--- a/cinderclient/v2/volumes.py
+++ b/cinderclient/v2/volumes.py
@@ -352,6 +352,8 @@ class VolumeManager(base.ManagerWithFind):
 
     def _action(self, action, volume, info=None, **kwargs):
         """Perform a volume "action."
+
+        :returns: tuple (response, body)
         """
         body = {action: info}
         self.run_hooks('modify_body_for_action', body, **kwargs)
-- 
cgit v1.2.1