Use the local configuration in the nfs drivers

Fixes bug 1158681

Change-Id: If797a5d3241d6129a8fefea1222b723f03f86452

diff --git a/cinder/tests/test_nfs.py b/cinder/tests/test_nfs.py
index ebeb0d1cdb1a2cd9868067c06a8888249cf95e0d..a79304531e82ec12f58fc17ec065766d81769708 100644 (file)
--- a/cinder/tests/test_nfs.py
+++ b/cinder/tests/test_nfs.py
@@ -156,6 +156,7 @@ class NfsDriverTestCase(test.TestCase):
         self.configuration = mox_lib.MockObject(conf.Configuration)
         self.configuration.append_config_values(mox_lib.IgnoreArg())
         self.configuration.nfs_shares_config = None
+        self.configuration.nfs_mount_options = None
         self.configuration.nfs_mount_point_base = '$state_path/mnt'
         self.configuration.nfs_disk_util = 'df'
         self.configuration.nfs_sparsed_volumes = True
@@ -477,8 +478,7 @@ class NfsDriverTestCase(test.TestCase):
     def test_setup_should_throw_error_if_shares_config_not_configured(self):
         """do_setup should throw error if shares config is not configured."""
         drv = self._driver
-
-        cfg.CONF.nfs_shares_config = self.TEST_SHARES_CONFIG_FILE
+        self.configuration.nfs_shares_config = self.TEST_SHARES_CONFIG_FILE
 
         self.assertRaises(exception.NfsException,
                           drv.do_setup, IsA(context.RequestContext))
@@ -488,7 +488,6 @@ class NfsDriverTestCase(test.TestCase):
         mox = self._mox
         drv = self._driver
         self.configuration.nfs_shares_config = self.TEST_SHARES_CONFIG_FILE
-        cfg.CONF.nfs_shares_config = self.TEST_SHARES_CONFIG_FILE
 
         mox.StubOutWithMock(os.path, 'exists')
         os.path.exists(self.TEST_SHARES_CONFIG_FILE).AndReturn(True)

diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index f95dbec6bfa0ad3b9db1d0051f4dbf68c7f457f4..767a26efaf6deceff31fa29350463fbb9161cfcb 100755 (executable)
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -312,8 +312,8 @@ class NfsDriver(RemoteFsDriver):
 
         # Construct the NFS mount command.
         nfs_cmd = ['mount', '-t', 'nfs']
-        if cfg.CONF.nfs_mount_options is not None:
-            nfs_cmd.extend(['-o', cfg.CONF.nfs_mount_options])
+        if self.configuration.nfs_mount_options is not None:
+            nfs_cmd.extend(['-o', self.configuration.nfs_mount_options])
         nfs_cmd.extend([nfs_share, mount_path])
 
         try: