From: Walter A. Boring IV Date: Fri, 11 Sep 2015 18:37:53 +0000 (+0000) Subject: HPMSA fix access to common options X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0957af28127bf9d8acd803c5d90f43f387b8924a;p=openstack-build%2Fcinder-build.git 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 8bcdf5f04..2c1da2869 100644 --- 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 051b0bef6..258b05083 100644 --- 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):