Merge signer packages into the existing packages include

hieradata/roles/infra/puppet/master.yaml

@@ -32,6 +32,10 @@ profiles::puppet::enc::repo: https://git.service.au-syd1.consul/unkinben/puppet-
 profiles::packages::include:
   encapic:
     ensure: '0.2.0'
+  certmanager:
+    ensure: '0.2.0'
+  sshsignhost:
+    ensure: '0.1.0'
 
 profiles::puppet::encapic::encapi_url: https://encapi.k8s.syd1.au.unkin.net
 profiles::puppet::server::external_nodes: '/usr/bin/encapic-enc'
@@ -62,13 +66,6 @@ profiles::helpers::sshsignhost::vault_config:
   role_name: 'signhost'
   role_id: "%{lookup('sshsignhost::role_id')}"
 
-# Vault signing helpers, delivered as RPMs from the rpm-internal repo.
-profiles::packages::include:
-  certmanager:
-    ensure: '0.2.0'
-  sshsignhost:
-    ensure: '0.1.0'
-
 profiles::puppet::server::agent_server: 'puppet.query.consul'
 profiles::puppet::server::report_server: 'puppet.query.consul'
 profiles::puppet::server::ca_server: 'puppetca.query.consul'