From b8a2f95f0f85806de885da4d9e0483296b6c0def Mon Sep 17 00:00:00 2001 From: Alexey Elagin Date: Thu, 6 Oct 2016 19:03:02 +0300 Subject: [PATCH] Change _get_pci_dev_list func Add hostname check and run lshw only on bootstrap nodes. Add sanitize param to lshw to hide any ip,mac etc Change-Id: I7739da68ab059178787ff0fe2418a54717684750 Closes-Bug: #1554970 --- agent | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent b/agent index 4e7acfe..344ea5e 100755 --- a/agent +++ b/agent @@ -1208,11 +1208,12 @@ class NodeAgent end def _get_pci_dev_list + return {} if `cat /etc/nailgun_systemtype` != 'bootstrap' lshw_timeout = @settings['lshw_timeout'] || 60 Timeout::timeout(lshw_timeout) do lshw_path = `which lshw`.chomp if $?.success? - data = `#{lshw_path} -json` + data = `#{lshw_path} -json -sanitize` return JSON.parse(data) if $?.success? @logger.warn("Can't get data from lshw. Reason: lshw exited with status #{$?.exitstatus}") else