From 73877c75b03992f0458a19fd00c5caca2ec17474 Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Fri, 12 Feb 2016 18:09:19 +0300 Subject: [PATCH] Exclude USB block devices by the default All USB storage devices must be filtered by the default as often this type of devices can be just an emulated temprorary storage for FW upgrade and so on. If one wants to get usb block devices reported to nailgun, then it could be either a cmdline option report_usb_block_devices or the same option added to the agent' config file. DocImpact Change-Id: Id609715732fd0ab393d1557b4810464fbfaf096e Closes-Bug: #1543221 --- agent | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agent b/agent index 5e04c95..f134b1f 100755 --- a/agent +++ b/agent @@ -714,14 +714,16 @@ class NodeAgent if STORAGE_CODES.include?(properties['MAJOR'].to_i) @logger.debug("Device #{devname} seems to be appropriate") # Exclude LVM volumes (in CentOS - 253, in Ubuntu - 252) using additional check - unless properties['DEVPATH'].include?('virtual/block/dm') + # Exclude any storage device connected through USB by the default + next if properties['DEVPATH'].include?('virtual/block/dm') || + (properties['ID_BUS'] == 'usb' && + !@settings.has_key?("report_usb_block_devices")) @blocks << { :name => basename_dir, :disk => _disk_path_by_name(devname) || devname, :extra => _disk_id_by_name(devname) || [], :removable => removable, } - end end end @logger.debug("Final list of physical devices is: #{@blocks.inspect}")