HPMSA fix access to common options

This patch fixes access to the options defined in
hpmsa_common.  They were recently renamed from common_opt
to common_opts, but the drivers weren't updated.

Change-Id: I381e61c8e44454f29bc6ff6f1a5a82bbc8ab9436
Partial-Bug: 1494877

diff --git a/cinder/volume/drivers/san/hp/hpmsa_fc.py b/cinder/volume/drivers/san/hp/hpmsa_fc.py
index 8bcdf5f044b25912545690cc1c6af7775f2c72f1..2c1da28694fb76088e97b667ba908ed6457cca1f 100644 (file)
--- a/cinder/volume/drivers/san/hp/hpmsa_fc.py
+++ b/cinder/volume/drivers/san/hp/hpmsa_fc.py
@@ -30,7 +30,7 @@ class HPMSAFCDriver(dothill_fc.DotHillFCDriver):
 
     def __init__(self, *args, **kwargs):
         super(HPMSAFCDriver, self).__init__(*args, **kwargs)
-        self.configuration.append_config_values(hpmsa_common.common_opt)
+        self.configuration.append_config_values(hpmsa_common.common_opts)
 
     def _init_common(self):
         return hpmsa_common.HPMSACommon(self.configuration)

diff --git a/cinder/volume/drivers/san/hp/hpmsa_iscsi.py b/cinder/volume/drivers/san/hp/hpmsa_iscsi.py
index 051b0bef6c029d092774b2bed75ba72e9a9a979d..258b05083ed5162580f969f890208ef840e99da5 100644 (file)
--- a/cinder/volume/drivers/san/hp/hpmsa_iscsi.py
+++ b/cinder/volume/drivers/san/hp/hpmsa_iscsi.py
@@ -30,8 +30,8 @@ class HPMSAISCSIDriver(dothill_iscsi.DotHillISCSIDriver):
 
     def __init__(self, *args, **kwargs):
         super(HPMSAISCSIDriver, self).__init__(*args, **kwargs)
-        self.configuration.append_config_values(hpmsa_common.common_opt)
-        self.configuration.append_config_values(hpmsa_common.iscsi_opt)
+        self.configuration.append_config_values(hpmsa_common.common_opts)
+        self.configuration.append_config_values(hpmsa_common.iscsi_opts)
         self.iscsi_ips = self.configuration.hpmsa_iscsi_ips
 
     def _init_common(self):