diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-21 17:19:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-21 17:19:36 +0000 |
| commit | b8b048166db93f4634eca372e00f36d5ac5741bb (patch) | |
| tree | c4d1dacabec07c0def01fd379dc63deb2d9f759d /nova/volume | |
| parent | b3cc1138cc013418303fc6bd9a4f9f37817d2a00 (diff) | |
| parent | c27312c2efb31b9ec88f5635029f9d2dc8667b50 (diff) | |
| download | nova-b8b048166db93f4634eca372e00f36d5ac5741bb.tar.gz nova-b8b048166db93f4634eca372e00f36d5ac5741bb.tar.xz nova-b8b048166db93f4634eca372e00f36d5ac5741bb.zip | |
Merge "Fixes to the SolarisISCSI Driver"
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/san.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nova/volume/san.py b/nova/volume/san.py index 81cd5a49f..22147141a 100644 --- a/nova/volume/san.py +++ b/nova/volume/san.py @@ -86,8 +86,8 @@ class SanISCSIDriver(nova.volume.driver.ISCSIDriver): remote protocol. """ - def __init__(self): - super(SanISCSIDriver, self).__init__() + def __init__(self, *args, **kwargs): + super(SanISCSIDriver, self).__init__(*args, **kwargs) self.run_local = FLAGS.san_is_local def _build_iscsi_target_name(self, volume): @@ -120,7 +120,7 @@ class SanISCSIDriver(nova.volume.driver.ISCSIDriver): return utils.execute(*cmd, **kwargs) else: check_exit_code = kwargs.pop('check_exit_code', None) - command = ' '.join(*cmd) + command = ' '.join(cmd) return self._run_ssh(command, check_exit_code) def _run_ssh(self, command, check_exit_code=True): @@ -211,9 +211,8 @@ class SolarisISCSIDriver(SanISCSIDriver): def _execute(self, *cmd, **kwargs): new_cmd = ['pfexec'] - new_cmd.extend(*cmd) - return super(SolarisISCSIDriver, self)._execute(self, - *new_cmd, + new_cmd.extend(cmd) + return super(SolarisISCSIDriver, self)._execute(*new_cmd, **kwargs) def _view_exists(self, luid): |