From: Ramana Raja <rraja@redhat.com>
Date: Thu, 14 Feb 2019 09:25:24 +0000 (+0530)
Subject: pybind/ceph_volume_client: allow volume_client to
X-Git-Tag: v14.1.0~98^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8c662e60d5ef4553a38bc4e521b03831238b719e;p=ceph-ci.git

pybind/ceph_volume_client: allow volume_client to

... mount a specificied ceph filesystem.

Signed-off-by: Ramana Raja <rraja@redhat.com>
---

diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
index 72b7a004472..9a6320493fe 100644
--- a/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@ -244,13 +244,15 @@ class CephFSVolumeClient(object):
     DEFAULT_NS_PREFIX = "fsvolumens_"
 
     def __init__(self, auth_id=None, conf_path=None, cluster_name=None,
-                 volume_prefix=None, pool_ns_prefix=None, rados=None):
+                 volume_prefix=None, pool_ns_prefix=None, rados=None,
+                 fs_name=None):
         """
         Either set all three of ``auth_id``, ``conf_path`` and
         ``cluster_name`` (rados constructed on connect), or
         set ``rados`` (existing rados instance).
         """
         self.fs = None
+        self.fs_name = fs_name
         self.connected = False
 
         self.conf_path = conf_path
@@ -474,7 +476,7 @@ class CephFSVolumeClient(object):
             self.evict(premount_evict)
             log.debug("Premount eviction of {0} completes".format(premount_evict))
         log.debug("CephFS mounting...")
-        self.fs.mount()
+        self.fs.mount(filesystem_name=self.fs_name)
         log.debug("Connection to cephfs complete")
 
         # Recover from partial auth updates due to a previous