hieradata/common.yaml

@@ -200,8 +200,9 @@ profiles::puppet::client::runtimeout: 3600
 profiles::puppet::client::show_diff: true
 profiles::puppet::client::usecacheonfailure: false
 
-profiles::puppet::puppetdb::puppetdb_host: prodinf01n04.main.unkin.net
-profiles::puppet::puppetdb::postgres_host: prodinf01n05.main.unkin.net
+# puppetdb
+puppetdbapi: prodinf01n04.main.unkin.net
+puppetdbsql: prodinf01n05.main.unkin.net
 
 prometheus::node_exporter::export_scrape_job: true
 prometheus::systemd_exporter::export_scrape_job: true

site/profiles/manifests/puppet/puppetboard.pp

@@ -8,7 +8,7 @@ class profiles::puppet::puppetboard (
   Integer $reports_count        = 40,
   Boolean $offline_mode         = true,
   String  $default_environment  = '*',
-  String  $puppetdb_host        = lookup('profiles::puppet::puppetdb::puppetdb_host'),
+  String  $puppetdb_host        = lookup('puppetdbapi'),
   Stdlib::AbsolutePath $basedir = '/opt/puppetboard',
   Stdlib::Absolutepath $virtualenv_dir  = "${basedir}/venv",
   Stdlib::Absolutepath $settings_file   = "${basedir}/settings.py",

site/profiles/manifests/puppet/puppetdb_api.pp

@@ -1,6 +1,6 @@
 # configure the puppetdb api service
 class profiles::puppet::puppetdb_api (
-  String $postgres_host = lookup('profiles::puppet::puppetdb::postgres_host'),
+  String $postgres_host = lookup('puppetdbsql'),
   String $listen_address = $facts['networking']['ip'],
   Stdlib::Absolutepath $java_bin = '/usr/bin/java',
   Hash   $java_args = {},

site/profiles/manifests/puppet/puppetdb_sql.pp

@@ -1,6 +1,6 @@
 # configure the puppetdb sql service
 class profiles::puppet::puppetdb_sql (
-  String $puppetdb_host = lookup('profiles::puppet::puppetdb::puppetdb_host'),
+  String $puppetdb_host = lookup('puppetdbsql'),
   String $listen_address = $facts['networking']['ip'],
 ) {
 

site/profiles/manifests/puppet/puppetmaster.pp

@@ -3,7 +3,7 @@
 # This class manages the puppetmaster using the ghoneycutt-puppet module.
 # It manages the server settings in the puppet.conf file.
 class profiles::puppet::puppetmaster (
-  Optional[Stdlib::Fqdn] $puppetdb_host = lookup('profiles::puppet::puppetdb::puppetdb_host', Optional[Stdlib::Fqdn], 'first', undef),
+  Optional[Stdlib::Fqdn] $puppetdb_host = lookup('puppetdbapi', Optional[Stdlib::Fqdn], 'first', undef),
 ) {
 
   if $facts['enc_role'] == 'roles::infra::puppet::master' {