Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
41756b06
Commit
41756b06
authored
Jan 26, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] 修复获取kvmcpu的bug
parent
9e36a2cb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
tasks.py
apps/assets/tasks.py
+3
-2
No files found.
apps/assets/tasks.py
View file @
41756b06
...
...
@@ -36,9 +36,10 @@ def set_assets_hardware_info(result, **kwargs):
result_raw
=
result
[
0
]
assets_updated
=
[]
for
hostname
,
info
in
result_raw
.
get
(
'ok'
,
{})
.
items
():
if
info
:
if
info
and
info
.
get
(
'setup'
)
:
info
=
info
[
'setup'
][
'ansible_facts'
]
else
:
logger
.
error
(
"Get asset info failed: {}"
.
format
(
hostname
))
continue
asset
=
get_object_or_none
(
Asset
,
hostname
=
hostname
)
...
...
@@ -50,7 +51,7 @@ def set_assets_hardware_info(result, **kwargs):
___sn
=
info
[
'ansible_product_serial'
]
for
___cpu_model
in
info
[
'ansible_processor'
]:
if
___cpu_model
.
endswith
(
'GHz'
):
if
___cpu_model
.
endswith
(
'GHz'
)
or
___cpu_model
.
startswith
(
"Intel"
)
:
break
else
:
___cpu_model
=
'Unknown'
...
...
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