We are going with this solution for the current internal alpha to enable testing/use by other groups.  A new story will divorce ohai from the cloud definitions before a public release is minted.