Stack

This is cleaner than https://github.com/CiscoSystems/openstack-installer/pull/110, but I'm not sure how to get rid of the commits that have come from a merge with master that are not from me.