Renames migration forced option in force

coriolis/api/v1/migrations.py

@@ -66,10 +66,10 @@ class MigrationController(api_wsgi.Controller):
 
         replica_id = migration_body.get("replica_id")
         if replica_id:
-            forced = migration_body.get("forced", False)
+            force = migration_body.get("force", False)
 
             migration = self._migration_api.deploy_replica_instances(
-                context, replica_id, forced)
+                context, replica_id, force)
         else:
             origin, destination, instances = self._validate_migration_input(
                 migration_body)

coriolis/conductor/rpc/client.py

@@ -76,10 +76,10 @@ class ConductorClient(object):
             ctxt, 'migrate_instances', origin=origin, destination=destination,
             instances=instances)
 
-    def deploy_replica_instances(self, ctxt, replica_id, forced=False):
+    def deploy_replica_instances(self, ctxt, replica_id, force=False):
         return self._client.call(
             ctxt, 'deploy_replica_instances', replica_id=replica_id,
-            forced=forced)
+            force=force)
 
     def delete_migration(self, ctxt, migration_id):
         self._client.call(

coriolis/conductor/rpc/server.py

@@ -280,11 +280,11 @@ class ConductorServerEndpoint(object):
         self._check_running_replica_migrations(ctxt, replica.id)
 
     @staticmethod
-    def _check_valid_replica_tasks_execution(replica, forced=False):
+    def _check_valid_replica_tasks_execution(replica, force=False):
         sorted_executions = sorted(
             replica.executions, key=lambda e: e.number, reverse=True)
 
-        if (forced and sorted_executions[0].status !=
+        if (force and sorted_executions[0].status !=
                 constants.EXECUTION_STATUS_COMPLETED):
             raise exception.InvalidReplicaState(
                 "The last replica tasks execution was not successful. "
@@ -297,10 +297,10 @@ class ConductorServerEndpoint(object):
                 "to be migrated")
 
     @replica_synchronized
-    def deploy_replica_instances(self, ctxt, replica_id, forced):
+    def deploy_replica_instances(self, ctxt, replica_id, force):
         replica = self._get_replica(ctxt, replica_id)
         self._check_replica_running_executions(ctxt, replica)
-        self._check_valid_replica_tasks_execution(replica, forced)
+        self._check_valid_replica_tasks_execution(replica, force)
 
         for instance, info in replica.info.items():
             if not info.get("volumes_info"):

coriolis/migrations/api.py

@@ -12,9 +12,9 @@ class API(object):
         return self._rpc_client.migrate_instances(
             ctxt, origin, destination, instances)
 
-    def deploy_replica_instances(self, ctxt, replica_id, forced=False):
+    def deploy_replica_instances(self, ctxt, replica_id, force=False):
         return self._rpc_client.deploy_replica_instances(
-            ctxt, replica_id, forced)
+            ctxt, replica_id, force)
 
     def delete(self, ctxt, migration_id):
         self._rpc_client.delete_migration(ctxt, migration_id)