From: Sasikanth <sasikanth.eda@in.ibm.com>
Date: Thu, 27 Mar 2014 15:14:50 +0000 (+0530)
Subject: Append nas_opts to IBMNAS_NFSDriver configuration
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=adb43dab7072a7e452710ac5db346e9a2c99993f;p=openstack-build%2Fcinder-build.git

Append nas_opts to IBMNAS_NFSDriver configuration

'nas_opts' were added in the NFS Driver (nfs.py), but were not appended
to the IBMNAS driver configuration, causing failure with the multi-backend
configuration of driver.

Adding the missing configuration.

Change-Id: I55727566d03573908750d01ae1345c4b6276f131
Closes-Bug: #1298279
---

diff --git a/cinder/volume/drivers/ibm/ibmnas.py b/cinder/volume/drivers/ibm/ibmnas.py
index ecfcaa794..f99cb7779 100644
--- a/cinder/volume/drivers/ibm/ibmnas.py
+++ b/cinder/volume/drivers/ibm/ibmnas.py
@@ -39,6 +39,7 @@ from cinder.openstack.common import processutils
 from cinder import units
 from cinder import utils
 from cinder.volume.drivers import nfs
+from cinder.volume.drivers.nfs import nas_opts
 from cinder.volume.drivers.san import san
 
 VERSION = '1.0.0'
@@ -61,6 +62,7 @@ class IBMNAS_NFSDriver(nfs.NfsDriver, san.SanDriver):
     def __init__(self, execute=utils.execute, *args, **kwargs):
         self._context = None
         super(IBMNAS_NFSDriver, self).__init__(*args, **kwargs)
+        self.configuration.append_config_values(nas_opts)
         self.configuration.san_ip = self.configuration.nas_ip
         self.configuration.san_login = self.configuration.nas_login
         self.configuration.san_password = self.configuration.nas_password