Switch back to openstack-puppet-modules