Well, I have to add the "do node lookup until you get something or timeout" thing, instead of "try once and quit if anything goes wrong" still, so that should help here. But I think if it loops through and never gets the heartbeat, we should consider that an error and quit. It will probably require redeploying Ironic at that point.