The previous way of handling Puppet modules for RDO was to bundle
them all
 together into a single "OpenStack-Puppet-Modules" package. This involved a
 lot of thankless manual work to merge all the modules into a single
 repository [1]. This will still be the case for Kilo, Liberty, and Mitaka
 releases. 
...
Important to note is that OPM starting Liberty is currently _without_
downstream patches, thanks to the work done by EmilienM and jayg !
Updates on stable/mitaka[1] and stable/liberty[2] branches are pure
upstream merges.
Cheers,
Alan
[1] 
https://github.com/redhat-openstack/openstack-puppet-modules/commits/stab...
[2] 
https://github.com/redhat-openstack/openstack-puppet-modules/commits/stab...