From: Walter A. Boring IV Date: Fri, 11 Sep 2015 18:32:29 +0000 (+0000) Subject: Dothill fix options access X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a93c0b727a239d0d4ab5f4b094ea0df6a83623fb;p=openstack-build%2Fcinder-build.git Dothill fix options access This patch fixes invalid access to the options that live in the dothill_common. They were recently renamed from common_opt to common_opts, but the drivers weren't updated. Change-Id: Iff411239a079f76c874b7b11f01a21f5f7d9f12e Partial-Bug: 1494877 --- diff --git a/cinder/volume/drivers/dothill/dothill_fc.py b/cinder/volume/drivers/dothill/dothill_fc.py index 9bbebe40d..7c332d99f 100644 --- a/cinder/volume/drivers/dothill/dothill_fc.py +++ b/cinder/volume/drivers/dothill/dothill_fc.py @@ -46,7 +46,7 @@ class DotHillFCDriver(cinder.volume.driver.FibreChannelDriver): def __init__(self, *args, **kwargs): super(DotHillFCDriver, self).__init__(*args, **kwargs) self.common = None - self.configuration.append_config_values(dothill_common.common_opt) + self.configuration.append_config_values(dothill_common.common_opts) self.configuration.append_config_values(san.san_opts) self.lookup_service = fczm_utils.create_lookup_service() diff --git a/cinder/volume/drivers/dothill/dothill_iscsi.py b/cinder/volume/drivers/dothill/dothill_iscsi.py index e6ddc1dac..7aa7803cd 100644 --- a/cinder/volume/drivers/dothill/dothill_iscsi.py +++ b/cinder/volume/drivers/dothill/dothill_iscsi.py @@ -51,8 +51,8 @@ class DotHillISCSIDriver(cinder.volume.driver.ISCSIDriver): def __init__(self, *args, **kwargs): super(DotHillISCSIDriver, self).__init__(*args, **kwargs) self.common = None - self.configuration.append_config_values(dothillcommon.common_opt) - self.configuration.append_config_values(dothillcommon.iscsi_opt) + self.configuration.append_config_values(dothillcommon.common_opts) + self.configuration.append_config_values(dothillcommon.iscsi_opts) self.configuration.append_config_values(san.san_opts) self.iscsi_ips = self.configuration.dothill_iscsi_ips