From f4dc301efda13a6a1769b071b1955a4869110b98 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 24 Sep 2013 13:49:26 -0400 Subject: [PATCH] Revert "Fix volume_rpcapi calls for chance/simple scheds" This reverts commit d5cd6528f361979b073aabd036be0d28dc1c4b95. Closes-Bug: #1229867 Change-Id: Iee866ddb08d52642bc36bd6ae82bd0d7283cad8e --- cinder/scheduler/chance.py | 4 +--- cinder/scheduler/simple.py | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cinder/scheduler/chance.py b/cinder/scheduler/chance.py index d2c563e56..0b9a4dac6 100644 --- a/cinder/scheduler/chance.py +++ b/cinder/scheduler/chance.py @@ -76,9 +76,7 @@ class ChanceScheduler(driver.Scheduler): updated_volume = driver.volume_update_db(context, volume_id, host) self.volume_rpcapi.create_volume(context, updated_volume, host, - allow_reschedule=False, - snapshot_id=snapshot_id, - image_id=image_id) + snapshot_id, image_id) def host_passes_filters(self, context, host, request_spec, filter_properties): diff --git a/cinder/scheduler/simple.py b/cinder/scheduler/simple.py index d131e63fe..5329d6fd7 100644 --- a/cinder/scheduler/simple.py +++ b/cinder/scheduler/simple.py @@ -62,10 +62,11 @@ class SimpleScheduler(chance.ChanceScheduler): if not utils.service_is_up(service): raise exception.WillNotSchedule(host=host) updated_volume = driver.volume_update_db(context, volume_id, host) - self.volume_rpcapi.create_volume(context, updated_volume, host, - allow_reschedule=False, - snapshot_id=snapshot_id, - image_id=image_id) + self.volume_rpcapi.create_volume(context, + updated_volume, + host, + snapshot_id, + image_id) return None results = db.service_get_all_volume_sorted(elevated) @@ -83,9 +84,8 @@ class SimpleScheduler(chance.ChanceScheduler): self.volume_rpcapi.create_volume(context, updated_volume, service['host'], - allow_reschedule=False, - snapshot_id=snapshot_id, - image_id=image_id) + snapshot_id, + image_id) return None msg = _("Is the appropriate service running?") raise exception.NoValidHost(reason=msg) -- 2.45.2