From 32a5a088a987df06f794b32568094ff09da46128 Mon Sep 17 00:00:00 2001 From: digvijay2016 Date: Wed, 7 Jun 2017 17:24:13 +0530 Subject: [PATCH] GPFS: Changing default value of NFS server type Spectrum Scale provide NFS service with Ganesha server by default (protocol node). So altering the default value of NFS server for easiness. Implements: blueprint gpfs-nfs-server-type-default-value-change Change-Id: I2e3adeca58505c2da4a5675f7342bb2a174078cc --- manila/share/drivers/ibm/gpfs.py | 6 +++--- manila/tests/share/drivers/ibm/test_gpfs.py | 4 ++-- ...s-server-type-default-value-change-58890adba373737c.yaml | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/gpfs-nfs-server-type-default-value-change-58890adba373737c.yaml diff --git a/manila/share/drivers/ibm/gpfs.py b/manila/share/drivers/ibm/gpfs.py index 485d75ce57..ba3711cc63 100644 --- a/manila/share/drivers/ibm/gpfs.py +++ b/manila/share/drivers/ibm/gpfs.py @@ -66,9 +66,9 @@ gpfs_share_opts = [ default='$state_path/mnt', help='Base folder where exported shares are located.'), cfg.StrOpt('gpfs_nfs_server_type', - default='KNFS', - help=('NFS Server type. Valid choices are "KNFS" (kernel NFS) ' - 'or "CES" (Ganesha NFS).')), + default='CES', + help=('NFS Server type. Valid choices are "CES" (Ganesha NFS) ' + 'or "KNFS" (Kernel NFS).')), cfg.ListOpt('gpfs_nfs_server_list', help=('A list of the fully qualified NFS server names that ' 'make up the OpenStack Manila configuration.')), diff --git a/manila/tests/share/drivers/ibm/test_gpfs.py b/manila/tests/share/drivers/ibm/test_gpfs.py index 18ca94979d..3048a526d0 100644 --- a/manila/tests/share/drivers/ibm/test_gpfs.py +++ b/manila/tests/share/drivers/ibm/test_gpfs.py @@ -75,7 +75,7 @@ mmcesnfslsexport:nfsexports:HEADER:version:reserved:reserved:Path:Delegations:Cl self.mock_object(gpfs.os.path, 'exists', mock.Mock(return_value=True)) self._driver._helpers = { - 'KNFS': self._helper_fake + 'CES': self._helper_fake } self.share = fake_share.fake_share(share_proto='NFS', host='fakehost@fakehost#GPFS') @@ -216,7 +216,7 @@ mmcesnfslsexport:nfsexports:HEADER:version:reserved:reserved:Path:Delegations:Cl def test_setup_helpers(self): self._driver._helpers = {} - CONF.set_default('gpfs_share_helpers', ['KNFS=fakenfs']) + CONF.set_default('gpfs_share_helpers', ['CES=fakenfs']) self.mock_object(gpfs.importutils, 'import_class', mock.Mock(return_value=self._helper_fake)) self._driver._setup_helpers() diff --git a/releasenotes/notes/gpfs-nfs-server-type-default-value-change-58890adba373737c.yaml b/releasenotes/notes/gpfs-nfs-server-type-default-value-change-58890adba373737c.yaml new file mode 100644 index 0000000000..c8a61e8b6f --- /dev/null +++ b/releasenotes/notes/gpfs-nfs-server-type-default-value-change-58890adba373737c.yaml @@ -0,0 +1,6 @@ +--- +other: + - | + Changing the default value of 'gpfs_nfs_server_type' configuration + parameter from KNFS to CES as Spectrum Scale provide NFS service with + Ganesha server by default.