Reverting "Puppet 3.6.2 install to ubuntu, Openstack modules"

This reverts commit f6089cdcbafc17aa106b754bda9fd00aee4d435e.