Project

General

Profile

« Previous | Next » 

Revision 14646e77

Added by Greg Sutcliffe about 10 years ago

Fixes #5637 - Don't raise lease conflicts when reading ad-hoc DHCP leases

View differences:

app/models/concerns/orchestration.rb
task.status = "conflict"
record_conflicts << e
failure e.message, nil, :conflict
#TODO: This is not a real error, but at the moment the proxy / foreman lacks better handling
# of the error instead of explode.
rescue Net::LeaseConflict => e
task.status = "failed"
failure _("DHCP has a lease at %s") % e, e.backtrace
rescue => e
task.status = "failed"
failure _("%{task} task failed with the following error: %{e}") % { :task => task.name, :e => e }, e.backtrace

Also available in: Unified diff