From ebfe626ae6986742d0d7b4dbd1cacef0ea49f7d1 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sun, 4 Oct 2026 15:00:41 +1100 Subject: [PATCH] Merge signer packages into the existing packages include --- hieradata/roles/infra/puppet/master.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hieradata/roles/infra/puppet/master.yaml b/hieradata/roles/infra/puppet/master.yaml index 8fcc850..a562598 100644 --- a/hieradata/roles/infra/puppet/master.yaml +++ b/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'