fix machine name/id when adding baremetal machine