Merge "[baremetal] Retry cinder.controller on failure"