From 4fbeb5c1725f59e4cf7fc08bbd3f2fa34120c8e7 Mon Sep 17 00:00:00 2001 From: wangyong <864072399@qq.com> Date: Thu, 7 Jan 2016 19:19:05 +0800 Subject: [PATCH] fix cpu bug --- jasset/asset_api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jasset/asset_api.py b/jasset/asset_api.py index 3385fd4b8..7cc49fa66 100644 --- a/jasset/asset_api.py +++ b/jasset/asset_api.py @@ -311,6 +311,7 @@ def excel_to_db(excel_file): def get_ansible_asset_info(asset_ip, setup_info): + print setup_info, '***' disk_need = {} disk_all = setup_info.get("ansible_devices") if disk_all: @@ -332,7 +333,7 @@ def get_ansible_asset_info(asset_ip, setup_info): mac = setup_info.get("ansible_default_ipv4").get("macaddress") brand = setup_info.get("ansible_product_name") cpu_type = setup_info.get("ansible_processor")[1] - cpu_cores = setup_info.get("ansible_processor_count") + cpu_cores = setup_info.get("ansible_processor_vcpus") cpu = cpu_type + ' * ' + unicode(cpu_cores) memory = setup_info.get("ansible_memtotal_mb") try: