Commit 1b85b8f4 by Guba Sándor

Merge branch 'feature-save_as-status' into 'master'

Feature Save As Status
parents b63173e2 e8e24d8b
...@@ -474,7 +474,8 @@ class Disk(TimeStampedModel): ...@@ -474,7 +474,8 @@ class Disk(TimeStampedModel):
queue_name = self.get_remote_queue_name("storage", priority="slow") queue_name = self.get_remote_queue_name("storage", priority="slow")
remote = storage_tasks.merge.apply_async(kwargs={ remote = storage_tasks.merge.apply_async(kwargs={
"old_json": self.get_disk_desc(), "old_json": self.get_disk_desc(),
"new_json": disk.get_disk_desc()}, "new_json": disk.get_disk_desc(),
"parent_id": task.request.id},
queue=queue_name queue=queue_name
) # Timeout ) # Timeout
while True: while True:
......
...@@ -507,6 +507,7 @@ class SaveAsTemplateOperation(InstanceOperation): ...@@ -507,6 +507,7 @@ class SaveAsTemplateOperation(InstanceOperation):
"with users and groups. Anyone who has access to a " "with users and groups. Anyone who has access to a "
"template (and to the networks it uses) will be able to " "template (and to the networks it uses) will be able to "
"start an instance of it.") "start an instance of it.")
has_percentage = True
abortable = True abortable = True
required_perms = ('vm.create_template', ) required_perms = ('vm.create_template', )
accept_states = ('RUNNING', 'STOPPED') accept_states = ('RUNNING', 'STOPPED')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment