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
4392ed39
authored
Nov 02, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'node-fixes' into 'master'
Node fixes See merge request !265
parents
53d054a1
b8cd2d07
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
circle/dashboard/templates/dashboard/node-detail/resources.html
+6
-4
circle/vm/models/node.py
+1
-1
circle/vm/operations.py
+2
-0
No files found.
circle/dashboard/templates/dashboard/node-detail/resources.html
View file @
4392ed39
...
...
@@ -12,10 +12,12 @@
<dt>
{% trans "Priority" %}:
</dt><dd>
{{ node.priority }}
</dd>
<dt>
{% trans "Driver Version:" %}
</dt>
<dd>
{{ node.driver_version.branch }} at
{{ node.driver_version.commit }} ({{ node.driver_version.commit_text }})
{% if node.driver_version.is_dirty %}
<span
class=
"label label-danger"
>
{% trans "with uncommitted changes!" %}
</span>
{% if node.driver_version %}
{{ node.driver_version.branch }} at
{{ node.driver_version.commit }} ({{ node.driver_version.commit_text }})
{% if node.driver_version.is_dirty %}
<span
class=
"label label-danger"
>
{% trans "with uncommitted changes!" %}
</span>
{% endif %}
{% endif %}
</dd>
<dt>
{% trans "Host owner" %}:
</dt>
...
...
circle/vm/models/node.py
View file @
4392ed39
...
...
@@ -291,7 +291,7 @@ class Node(OperatedMixin, TimeStampedModel):
@property
@node_available
def
driver_version
(
self
):
return
self
.
info
[
'driver_version'
]
return
self
.
info
.
get
(
'driver_version'
)
@property
@node_available
...
...
circle/vm/operations.py
View file @
4392ed39
...
...
@@ -1100,6 +1100,7 @@ class ActivateOperation(NodeOperation):
def
_operation
(
self
):
self
.
node
.
enabled
=
True
self
.
node
.
schedule_enabled
=
True
self
.
node
.
get_info
(
invalidate_cache
=
True
)
self
.
node
.
save
()
...
...
@@ -1121,6 +1122,7 @@ class PassivateOperation(NodeOperation):
def
_operation
(
self
):
self
.
node
.
enabled
=
True
self
.
node
.
schedule_enabled
=
False
self
.
node
.
get_info
(
invalidate_cache
=
True
)
self
.
node
.
save
()
...
...
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