From: Ramana Raja <rraja@redhat.com>
Date: Tue, 4 Oct 2016 08:25:46 +0000 (+0530)
Subject: ceph_volume_client: fix partial auth recovery
X-Git-Tag: v10.2.6~150^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3320ef1944a10cc5835510ee752750237cbefc7a;p=ceph.git

ceph_volume_client: fix partial auth recovery

... for volumes whose group_id is None.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 0ab8badcf3ffe685135af17dc28b238f6e686922)
---

diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
index 2afc95f9c71c..d02b7487dcff 100644
--- a/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@ -329,6 +329,7 @@ class CephFSVolumeClient(object):
                 continue
 
             (group_id, volume_id) = volume.split('/')
+            group_id = group_id if group_id is not 'None' else None
             volume_path = VolumePath(group_id, volume_id)
             access_level = volume_data['access_level']