Merge "Add new hiera with default for baremetal"