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
dceb22e2
authored
Nov 01, 2016
by
Szabolcs Gelencser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move install diagnostics task from vm driver to agent driver.
parent
c462cc6d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
circle/vm/operations.py
+2
-2
circle/vm/tasks/agent_tasks.py
+3
-0
circle/vm/tasks/vm_tasks.py
+0
-4
No files found.
circle/vm/operations.py
View file @
dceb22e2
...
@@ -464,8 +464,8 @@ class DeployOperation(InstanceOperation):
...
@@ -464,8 +464,8 @@ class DeployOperation(InstanceOperation):
name
=
_
(
"Start diagnostics on virtual machine"
)
name
=
_
(
"Start diagnostics on virtual machine"
)
def
_operation
(
self
):
def
_operation
(
self
):
vm
_tasks
.
install_diagnostics_extension
.
apply_async
(
agent
_tasks
.
install_diagnostics_extension
.
apply_async
(
args
=
[
self
.
instance
.
name
],
queue
=
"localhost.
vm.fas
t"
args
=
[
self
.
instance
.
name
],
queue
=
"localhost.
localdomain.agen
t"
)
.
get
(
timeout
=
1200
)
)
.
get
(
timeout
=
1200
)
@register_operation
@register_operation
...
...
circle/vm/tasks/agent_tasks.py
View file @
dceb22e2
...
@@ -17,6 +17,9 @@
...
@@ -17,6 +17,9 @@
from
manager.mancelery
import
celery
from
manager.mancelery
import
celery
@celery.task
(
name
=
'agent.install_diagnostics_extension'
)
def
install_diagnostics_extension
(
vm_name
):
pass
@celery.task
(
name
=
'agent.change_password'
)
@celery.task
(
name
=
'agent.change_password'
)
def
change_password
(
vm
,
password
):
def
change_password
(
vm
,
password
):
...
...
circle/vm/tasks/vm_tasks.py
View file @
dceb22e2
...
@@ -61,10 +61,6 @@ def get_queues():
...
@@ -61,10 +61,6 @@ def get_queues():
cache
.
set
(
key
,
result
,
10
)
cache
.
set
(
key
,
result
,
10
)
return
result
return
result
@celery.task
(
name
=
'vmdriver.install_diagnostics_extension'
)
def
install_diagnostics_extension
(
vm_name
):
pass
@celery.task
(
name
=
'vmdriver.save_as_template'
)
@celery.task
(
name
=
'vmdriver.save_as_template'
)
def
save_as_template
(
vm_name
,
vm_pk
):
def
save_as_template
(
vm_name
,
vm_pk
):
pass
pass
...
...
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