openstack
/
fuel-nailgun-agent
Code Issues Proposed changes

Merge "Handle absent manufacturer field correctly"

This commit is contained in:
Jenkins 2016-11-25 13:25:45 +00:00 committed by Gerrit Code Review
parent 214c9c7517 ac5c37be5c
commit b0ee75ca91
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent
View File

@ -1049,10 +1049,10 @@ class NodeAgent
def _manufacturer def _manufacturer
if _is_virtualbox if _is_virtualbox
@facter['productname'] @facter['productname']
elsif (@facter['manufacturer'].upcase != 'QEMU' && @facter['is_virtual']) elsif (@facter.fetch('manufacturer', '').upcase != 'QEMU' && @facter['is_virtual'])
@facter['virtual'] @facter['virtual']
else else
@facter['manufacturer'] @facter.fetch('manufacturer', '')
end end
end end