From 49fec70e991cd01eacf7ecf94614be96deb5d19d Mon Sep 17 00:00:00 2001 From: "Walter A. Boring IV" Date: Fri, 11 Sep 2015 18:35:19 +0000 Subject: [PATCH] Lenovo driver fix access to common opts This patch fixes access to the lenovo_common options. They were recently renamed from common_opt to common_opts, but the drivers weren't updated. Change-Id: I63583394d58cb8fc791787df35ed04d30113fafe Partial-Bug: 1494877 --- cinder/volume/drivers/lenovo/lenovo_fc.py | 2 +- cinder/volume/drivers/lenovo/lenovo_iscsi.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinder/volume/drivers/lenovo/lenovo_fc.py b/cinder/volume/drivers/lenovo/lenovo_fc.py index aa33bf4a1..79573eecb 100644 --- a/cinder/volume/drivers/lenovo/lenovo_fc.py +++ b/cinder/volume/drivers/lenovo/lenovo_fc.py @@ -30,7 +30,7 @@ class LenovoFCDriver(dothill_fc.DotHillFCDriver): def __init__(self, *args, **kwargs): super(LenovoFCDriver, self).__init__(*args, **kwargs) - self.configuration.append_config_values(lenovo_common.common_opt) + self.configuration.append_config_values(lenovo_common.common_opts) def _init_common(self): return lenovo_common.LenovoCommon(self.configuration) diff --git a/cinder/volume/drivers/lenovo/lenovo_iscsi.py b/cinder/volume/drivers/lenovo/lenovo_iscsi.py index 0fb99a8ba..e4387b2b4 100644 --- a/cinder/volume/drivers/lenovo/lenovo_iscsi.py +++ b/cinder/volume/drivers/lenovo/lenovo_iscsi.py @@ -30,8 +30,8 @@ class LenovoISCSIDriver(dothill_iscsi.DotHillISCSIDriver): def __init__(self, *args, **kwargs): super(LenovoISCSIDriver, self).__init__(*args, **kwargs) - self.configuration.append_config_values(lenovo_common.common_opt) - self.configuration.append_config_values(lenovo_common.iscsi_opt) + self.configuration.append_config_values(lenovo_common.common_opts) + self.configuration.append_config_values(lenovo_common.iscsi_opts) self.iscsi_ips = self.configuration.lenovo_iscsi_ips def _init_common(self): -- 2.45.2