Allinone

This also needs a change to puppet-openstack which is being worked upstream as well as will have a pull request against the Cisco version in advance of upstream acceptance (has to go to master then back to stable/grizzly).

Upstream master: https://review.openstack.org/#/c/42070/