unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
Conversation 0 Commits 449 Files Changed 291 +5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6335167e3a - Show all commits

2
hieradata/common.yaml
View File

@ -180,6 +180,8 @@ profiles::packages::remove:
profiles::base::scripts::scripts: profiles::base::scripts::scripts:
puppet: puppetwrapper.py puppet: puppetwrapper.py
profiles::puppet::client::server: 'puppet.query.consul'
profiles::puppet::client::ca_server: 'puppetca.query.consul'
profiles::puppet::client::environment: 'develop' profiles::puppet::client::environment: 'develop'
profiles::puppet::client::runinterval: 1800 profiles::puppet::client::runinterval: 1800
profiles::puppet::client::runtimeout: 3600 profiles::puppet::client::runtimeout: 3600

3
hieradata/roles/infra/puppet/master.yaml
View File

@ -37,6 +37,9 @@ profiles::helpers::certmanager::vault_config:
output_path: '/tmp/certmanager' output_path: '/tmp/certmanager'
role_id: "%{lookup('certmanager::role_id')}" role_id: "%{lookup('certmanager::role_id')}"
profiles::puppet::server::agent_server: 'puppet.query.consul'
profiles::puppet::server::report_server: 'puppet.query.consul'
profiles::puppet::server::ca_server: 'puppetca.query.consul'
profiles::puppet::server::dns_alt_names: profiles::puppet::server::dns_alt_names:
- "%{facts.networking.fqdn}" - "%{facts.networking.fqdn}"
- "%{facts.networking.hostname}" - "%{facts.networking.hostname}"