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 +7 -6
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 770c8cc159 - Show all commits

5
hieradata/common.yaml
View File

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

2
site/profiles/manifests/puppet/puppetboard.pp
View File

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

2
site/profiles/manifests/puppet/puppetdb_api.pp
View File

@ -1,6 +1,6 @@
# configure the puppetdb api service # configure the puppetdb api service
class profiles::puppet::puppetdb_api ( 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'], String $listen_address = $facts['networking']['ip'],
Stdlib::Absolutepath $java_bin = '/usr/bin/java', Stdlib::Absolutepath $java_bin = '/usr/bin/java',
Hash $java_args = {}, Hash $java_args = {},

2
site/profiles/manifests/puppet/puppetdb_sql.pp
View File

@ -1,6 +1,6 @@
# configure the puppetdb sql service # configure the puppetdb sql service
class profiles::puppet::puppetdb_sql ( 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'], String $listen_address = $facts['networking']['ip'],
) { ) {

2
site/profiles/manifests/puppet/puppetmaster.pp
View File

@ -3,7 +3,7 @@
# This class manages the puppetmaster using the ghoneycutt-puppet module. # This class manages the puppetmaster using the ghoneycutt-puppet module.
# It manages the server settings in the puppet.conf file. # It manages the server settings in the puppet.conf file.
class profiles::puppet::puppetmaster ( 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' { if $facts['enc_role'] == 'roles::infra::puppet::master' {