Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
1b85b8f4
authored
Sep 24, 2014
by
Guba Sándor
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-save_as-status' into 'master'
Feature Save As Status
parents
b63173e2
e8e24d8b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
circle/storage/models.py
+2
-1
circle/vm/operations.py
+1
-0
No files found.
circle/storage/models.py
View file @
1b85b8f4
...
...
@@ -474,7 +474,8 @@ class Disk(TimeStampedModel):
queue_name
=
self
.
get_remote_queue_name
(
"storage"
,
priority
=
"slow"
)
remote
=
storage_tasks
.
merge
.
apply_async
(
kwargs
=
{
"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
)
# Timeout
while
True
:
...
...
circle/vm/operations.py
View file @
1b85b8f4
...
...
@@ -507,6 +507,7 @@ class SaveAsTemplateOperation(InstanceOperation):
"with users and groups. Anyone who has access to a "
"template (and to the networks it uses) will be able to "
"start an instance of it."
)
has_percentage
=
True
abortable
=
True
required_perms
=
(
'vm.create_template'
,
)
accept_states
=
(
'RUNNING'
,
'STOPPED'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment