Puppetlabs repos and install package

I’m using a puppet 6 CA with an intermediate certificate. This requires that all the puppet agents are 6+ as well. Looking through the puppet provisioning template snippets there’s various settings for puppet and it’s repos with versions 4 and 5. There’s also pc1 for the repo and a generic enable-puppetlabs-repo. There are no specific settings for version 6.

enable-puppetlabs-repo sets up the correct repo in the puppetlabs_repo snippet but that setting is not used in the puppetlabs_setup snippet. Therefore it will install puppet and not puppet-agent and doesn’t use the /etc/puppetlabs directory (so I imagine this won’t work). I could enable-puppetlabs-pc1-repo which is used in both but I’m running Ubuntu 18 (bionic) and there’s no pc1 release for bionic at https://apt.puppetlabs.com/.

Am I missing something or doing something stupid? What’s the right path here?

Apologies. I just came across this: https://github.com/theforeman/community-templates/pull/597

Looks like it’s all cleaned up in a recent version.