Updated schema to support baremetal servers

Change-Id: I181b1b25e56ab8c4848ec15ee2b807f704ee8703
Merge "Updated schema to support baremetal servers"