Merge "Update nova-compute to support baremetal case"