Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
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
64e19ee1
authored
Sep 18, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: yield vnc port only at destroy
parent
9831b9b0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
7 deletions
+0
-7
circle/vm/models/instance.py
+0
-4
circle/vm/operations.py
+0
-3
No files found.
circle/vm/models/instance.py
View file @
64e19ee1
...
...
@@ -459,10 +459,6 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
except
ActivityInProgressError
:
pass
# discard state change if another activity is in progress.
else
:
if
new_state
==
'STOPPED'
:
self
.
vnc_port
=
None
self
.
node
=
None
self
.
save
()
act
.
finished
=
act
.
started
act
.
resultant_state
=
new_state
act
.
succeeded
=
True
...
...
circle/vm/operations.py
View file @
64e19ee1
...
...
@@ -629,7 +629,6 @@ class ShutdownOperation(InstanceOperation):
def
_operation
(
self
,
task
=
None
):
self
.
instance
.
shutdown_vm
(
task
=
task
)
self
.
instance
.
yield_node
()
self
.
instance
.
yield_vnc_port
()
def
on_abort
(
self
,
activity
,
error
):
if
isinstance
(
error
,
TimeLimitExceeded
):
...
...
@@ -670,9 +669,7 @@ class ShutOffOperation(InstanceOperation):
with
activity
.
sub_activity
(
'delete_vm'
):
self
.
instance
.
delete_vm
()
# Clear node and VNC port association
self
.
instance
.
yield_node
()
self
.
instance
.
yield_vnc_port
()
register_operation
(
ShutOffOperation
)
...
...
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