Redo block arg in retry_on_fail to be more specific

This is a bit more idiomatic, and also fails more helpfully if no block is
passed.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>