Merge pull request 'fix: set the puppetdb_host correctly' (#29) from neoloc/puppetdb_server_loc into develop

Reviewed-on: unkinben/puppet-prod#29
This commit is contained in:
Ben Vincent 2023-10-21 23:17:00 +09:30
commit 2faed5de72
2 changed files with 8 additions and 2 deletions

View File

@ -34,5 +34,6 @@ class profiles::puppet::puppetdb(
class { 'puppetdb::server':
database_host => $listen_address,
postgresql_ssl_on => false,
manage_firewall => false,
}
}

View File

@ -22,12 +22,17 @@
#
# Limitations:
# This is designed to work on Unix-like systems.
class profiles::puppet::puppetmaster {
class profiles::puppet::puppetmaster (
String $puppetdb_host = lookup('profiles::puppet::puppetdb::puppetdb_host'),
) {
include profiles::puppet::r10k
include profiles::puppet::g10k
include profiles::puppet::enc
include profiles::puppet::autosign
include puppetdb::master::config
class { 'puppetdb::master::config':
puppetdb_server => $puppetdb_host,
}
class { 'profiles::puppet::server':
vardir => '/opt/puppetlabs/server/data/puppetserver',