Fix baremetal flavors

The baremetal flavor is now created by setup-baremetal, if doing real
baremetal then we have to call it with no MACS so flavor is created.

Also make sure the quantity of ram and disk size matches the flavor.

Change-Id: I17b4bb89f2156d4de320ec27b22143675e4dd4f1
Merge "Fix baremetal flavors"