openstack/fuel-main
Code Issues Proposed changes

Rescue network data in bin/agent

Browse Source
This commit is contained in:
Dmitry Pyzhov
2013-03-06 16:53:55 +04:00
parent fdd22a57a7
commit 584455baf1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/agent
View File

@@ -165,9 +165,13 @@ class NodeAgent
(intinfo[:addresses] or {} rescue {}).each do |addr, addrinfo|
if (addrinfo[:family] rescue nil) =~ /lladdr/
int_meta[:mac] = addr
int_info = Rethtool::InterfaceSettings.new(int)
int_meta[:max_speed] = int_info.best_mode.speed
int_meta[:current_speed] = int_info.current_mode.speed
begin
int_info = Rethtool::InterfaceSettings.new(int)
int_meta[:max_speed] = int_info.best_mode.speed
int_meta[:current_speed] = int_info.current_mode.speed
rescue
int_meta[:current_speed] = nil
end
elsif (addrinfo[:family] rescue nil) =~ /^inet$/
int_meta[:ip] = addr
int_meta[:netmask] = addrinfo[:netmask] if addrinfo[:netmask]