Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gutyán Gábor
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4a0c749b
authored
Aug 01, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: prevent propagation of failed renew in wake_up & deploy
parent
0468d9f5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
circle/vm/operations.py
+6
-1
No files found.
circle/vm/operations.py
View file @
4a0c749b
...
@@ -285,7 +285,10 @@ class DeployOperation(InstanceOperation):
...
@@ -285,7 +285,10 @@ class DeployOperation(InstanceOperation):
"boot virtual machine"
)):
"boot virtual machine"
)):
self
.
instance
.
resume_vm
(
timeout
=
timeout
)
self
.
instance
.
resume_vm
(
timeout
=
timeout
)
try
:
self
.
instance
.
renew
(
parent_activity
=
activity
)
self
.
instance
.
renew
(
parent_activity
=
activity
)
except
:
pass
register_operation
(
DeployOperation
)
register_operation
(
DeployOperation
)
...
@@ -726,8 +729,10 @@ class WakeUpOperation(InstanceOperation):
...
@@ -726,8 +729,10 @@ class WakeUpOperation(InstanceOperation):
"deploy network"
)):
"deploy network"
)):
self
.
instance
.
deploy_net
()
self
.
instance
.
deploy_net
()
# Renew vm
try
:
self
.
instance
.
renew
(
parent_activity
=
activity
)
self
.
instance
.
renew
(
parent_activity
=
activity
)
except
:
pass
register_operation
(
WakeUpOperation
)
register_operation
(
WakeUpOperation
)
...
...
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