Revert "Fix volume_rpcapi calls for chance/simple scheds"

This reverts commit d5cd6528f361979b073aabd036be0d28dc1c4b95.

Closes-Bug: #1229867

Change-Id: Iee866ddb08d52642bc36bd6ae82bd0d7283cad8e

diff --git a/cinder/scheduler/chance.py b/cinder/scheduler/chance.py
index d2c563e5671475fdf0f0abec3d932e63b0778486..0b9a4dac67d6ed8a608c0196c38fa29ce357cd14 100644 (file)
--- 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 d131e63feafb2e599dc5fa7085bf3539a28b6aba..5329d6fd7c60960ec393348b834b266ff7d5ef35 100644 (file)
--- 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)