diff options
| author | Shwetha Panduranga <spandura@redhat.com> | 2016-12-01 00:50:32 +0530 |
|---|---|---|
| committer | Shwetha Panduranga <spandura@redhat.com> | 2016-12-01 00:51:28 +0530 |
| commit | 0faf837454e3636876483dc289342e202af318e2 (patch) | |
| tree | 3943ee04658c15efa1dc29b2fc59ae693d4f79d8 /glustolibs-gluster/glustolibs/gluster/gluster_base_class.py | |
| parent | 279c2a99af5cb45b0b889aa8da8450a92969e216 (diff) | |
Start gluster nfs-server only when the mount type is 'nfs'.
Change-Id: Ie7a25927d9bd55a7115adfae4fd550f96f435950
Signed-off-by: Shwetha Panduranga <spandura@redhat.com>
Diffstat (limited to 'glustolibs-gluster/glustolibs/gluster/gluster_base_class.py')
| -rw-r--r-- | glustolibs-gluster/glustolibs/gluster/gluster_base_class.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py index 23274e97f..5c38e0919 100644 --- a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py +++ b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py @@ -151,6 +151,15 @@ class GlusterBaseClass(unittest.TestCase): cls.volume_type) return False + # Set volume options + if 'options' not in cls.volume: + cls.volume['options'] = {} + + # Set nfs.disable to 'off' to start gluster-nfs server on start of the + # volume if the mount type is 'nfs' + if cls.mount_type == 'nfs': + cls.volume['options']['nfs.disable'] = 'off' + # SMB Info if cls.mount_type == 'cifs' or cls.mount_type == 'smb': cls.volume['smb'] = {} @@ -326,8 +335,7 @@ class GlusterVolumeBaseClass(GlusterBaseClass): (mount_obj.server_system, mount_obj.volname, mount_obj.client_system, mount_obj.mountpoint)) rc = False - if not rc: - return False + assert (rc == True), ("Unmount of all mounts are not successful") # Cleanup volume if cleanup_vol: |