diff options
| author | Maru Newby <mnewby@internap.com> | 2012-08-24 14:55:23 -0700 |
|---|---|---|
| committer | Maru Newby <mnewby@internap.com> | 2012-08-24 15:06:37 -0700 |
| commit | 44d467402d31c3ca29b4c4e3fae41aff3fca7593 (patch) | |
| tree | 8038ab005535800f4a2c2598ae2dd81433c859db /nova | |
| parent | e3e3f6198368ffbe023277e96249a776348db14d (diff) | |
| download | nova-44d467402d31c3ca29b4c4e3fae41aff3fca7593.tar.gz nova-44d467402d31c3ca29b4c4e3fae41aff3fca7593.tar.xz nova-44d467402d31c3ca29b4c4e3fae41aff3fca7593.zip | |
Fix broken SimpleScheduler.schedule_run_instance()
* The fix for 1037829 broke SimpleScheduler by unnecessarily
including the 'self' parameter in the invocation of the parent's
schedule_run_instance(). This change removes the 'self' parameter.
* Addresses bug 1041385
Change-Id: I95b28fce9b17b6c1d9ca2f19cd83608cde8479ee
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/scheduler/simple.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py index 354e7cfc1..f8a1e4154 100644 --- a/nova/scheduler/simple.py +++ b/nova/scheduler/simple.py @@ -51,7 +51,7 @@ class SimpleScheduler(chance.ChanceScheduler): deprecated.warn(_('SimpleScheduler now only covers volume scheduling ' 'and is deprecated in Folsom. Non-volume functionality in ' 'SimpleScheduler has been replaced by FilterScheduler')) - super(SimpleScheduler, self).schedule_run_instance(self, context, + super(SimpleScheduler, self).schedule_run_instance(context, request_spec, reservations, *_args, **_kwargs) def schedule_create_volume(self, context, volume_id, *_args, **_kwargs): |