This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle. The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.
+This Puppet module configures settings for Puppet master , agents and R10k, the full bundle. Puppetdb has been outsourced to a module on its own, due to complexity
+ +The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.
if the host FQDN matches your specified Puppet master via $pt_pm_fqdn, it installs and configures a puppetmaster. On your puppetmaster, If you set $pt_use_r10kto true, it also installs r10k to connect to a control repo and manage the code available to clients via Puppetfile. If you set $pt_use_r10k_webhookto true, it also installs a simple webhook listener to watch for post_hooks from gitlab, and triggers the r10k deployment.
if the host FQDN matches your specified puppetdb host via $pt_db_fqdn, Puppetdb is installed and added to the puppetmaster config. Settings for the (external) postgreSQL database are also configured.
open firewall ports depending on fqdn choices
start services as required
diff --git a/doc/index.html b/doc/index.html index 3b66c1d..33a6883 100644 --- a/doc/index.html +++ b/doc/index.html @@ -66,7 +66,9 @@This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle. The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.
+This Puppet module configures settings for Puppet master , agents and R10k, the full bundle. Puppetdb has been outsourced to a module on its own, due to complexity
+ +The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.
if the host FQDN matches your specified Puppet master via $pt_pm_fqdn, it installs and configures a puppetmaster. On your puppetmaster, If you set $pt_use_r10kto true, it also installs r10k to connect to a control repo and manage the code available to clients via Puppetfile. If you set $pt_use_r10k_webhookto true, it also installs a simple webhook listener to watch for post_hooks from gitlab, and triggers the r10k deployment.
if the host FQDN matches your specified puppetdb host via $pt_db_fqdn, Puppetdb is installed and added to the puppetmaster config. Settings for the (external) postgreSQL database are also configured.
open firewall ports depending on fqdn choices
start services as required
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 78cd518..f42505a 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -71,48 +71,20 @@# File 'manifests/main/config.pp', line 6
@@ -123,10 +119,6 @@ class puppet_cd::main::config (
) inherits puppet_cd::params {
include puppet_cd::server::service
- if $pt_use_puppetdb == true {
- include puppet_cd::puppetdb::service
- }
-
if $pt_use_r10k == true {
include puppet_cd::r10k::install
}
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
index 3297907..948c615 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
@@ -129,30 +129,7 @@
31
32
33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
+34
# File 'manifests/main/files.pp', line 6
@@ -185,29 +162,6 @@ class puppet_cd::main::files (
notify => Service[$pt_agent_service,$pt_server_service],
}
}
-
- if $pt_use_puppetdb == true {
- file { $pt_puppetdb_conf_file:
- ensure => file,
- path => $pt_puppetdb_conf_file,
- owner => 'root',
- group => 'root',
- mode => '0644',
- content => template($pt_puppetdb_conf_erb),
-# notify => Service[$pt_agent_service,$pt_server_service],
- }
-
- # fix service file syslog vs journald
- file { $pt_puppetdb_service_file:
- ensure => file,
- path => $pt_puppetdb_service_file,
- owner => 'root',
- group => 'root',
- mode => '0644',
- content => template($pt_puppetdb_service_erb),
- notify => Service[$pt_db_service],
- }
- }
}
# File 'manifests/main/user.pp', line 6
@@ -167,25 +148,6 @@ class puppet_cd::main::user (
allowdupe => false,
}
}
-
- if ($fqdn == $pt_db_fqdn) and ($pt_manage_db_user == true) {
- user { $pt_db_user:
- ensure => present,
- name => $pt_db_user,
- allowdupe => false,
- comment => $pt_db_user_comment,
- gid => $pt_db_user,
- managehome => true,
- home => $pt_db_user_home,
- shell => $pt_db_user_shell,
- }
-
- group { $pt_db_user:
- ensure => present,
- name => $pt_db_user,
- allowdupe => false,
- }
- }
}
# File 'manifests/params.pp', line 89
@@ -1705,7 +1575,6 @@ class puppet_cd::params (
Boolean $pt_manage_fw = true,
String $pt_pm_fqdn = 'puppetmaster.example.net',
- String $pt_db_fqdn = 'puppetdb.example.net',
# installation
String $pt_pkg_ensure = 'latest',
@@ -1722,12 +1591,7 @@ class puppet_cd::params (
String $pt_user_comment = 'puppetserver daemon',
String $pt_user_home = '/opt/puppetlabs/server/data/puppetserver',
String $pt_user_shell = '/sbin/nologin',
- ## puppetdb user
- Boolean $pt_manage_db_user = false,
- String $pt_db_user = 'puppetdb',
- String $pt_db_user_comment = 'PuppetDB daemon',
- String $pt_db_user_home = '/opt/puppetlabs/server/data/puppetdb',
- String $pt_db_user_shell = '/sbin/nologin',
+
# templates
## puppet
String $pt_environment = 'production',
@@ -1757,33 +1621,6 @@ class puppet_cd::params (
String $pt_storeconfigs_backend = 'puppetdb',
String $pt_parser = 'current',
Boolean $pt_cert_revocation = true,
- ## puppetdb
- Boolean $pt_use_puppetdb = false,
- String $pt_logging_max_file_size = '200MB',
- String $pt_logging_max_history = '90',
- String $pt_logging_total_size = '1GB',
- String $pt_com_proc_threads = '4',
- String $pt_concurrent_writes = '4',
- String $pt_db_subname = '//localhost:5432/puppetdb',
- String $pt_db_username = 'foobar',
- String $pt_db_password = 'foobar',
- String $pt_gc_interval = '60',
- String $pt_log_slow_statements = '10',
- String $pt_no_ssl_port = '8080',
- String $pt_ssl_port = '8081',
- Boolean $pt_use_ssl_only = true,
- String $pt_puppetdb_source_lan = '0.0.0.0/0',
- Boolean $pt_soft_write_failure = false,
- String $pt_no_ssl_host = '0.0.0.0',
- String $pt_ssl_host = '0.0.0.0',
- String $pt_ssl_key = '/etc/puppetlabs/puppetdb/ssl/private.pem',
- String $pt_ssl_cert = '/etc/puppetlabs/puppetdb/ssl/public.pem',
- String $pt_ssl_ca_cert = '/etc/puppetlabs/puppetdb/ssl/ca.pem',
- Boolean $pt_log_access = false,
- String $pt_access_log_config = '/etc/puppetlabs/puppetdb/request-logging.xml',
- Boolean $pt_enable_repl = false,
- String $pt_repl_port = '8082',
- String $pt_repl_host = '127.0.0.1',
# r10k
Boolean $pt_use_r10k = false,
@@ -1812,12 +1649,7 @@ class puppet_cd::params (
$pt_rundir_master = '/var/run/puppetlabs/puppetserver'
$pt_vardir = '/opt/puppetlabs/puppet/cache'
$pt_vardir_master = '/opt/puppetlabs/server/data/puppetserver'
-## puppetdb
- $pt_puppetdb_main = '/etc/puppetlabs/puppetdb'
- $pt_puppetdb_conf_d = "${pt_puppetdb_main}/conf.d"
- $pt_puppetdb_ssl = "${pt_puppetdb_main}/ssl"
- $pt_puppetdb_log = '/var/log/puppetlabs/puppetdb'
- $pt_puppetdb_var_dir = '/opt/puppetlabs/server/data/puppetdb'
+
## r10k
$pt_r10k_dir = "${pt_main_dir}/r10k"
$pt_r10k_webhook_dir = '/etc/r10k-webhook'
@@ -1828,26 +1660,7 @@ class puppet_cd::params (
$pt_puppet_conf_erb = 'puppet_cd/puppet.conf.erb'
$pt_agent_conf_erb = 'puppet_cd/agent.conf.erb'
$pt_hiera_config = "${pt_puppetdir}/hiera.yaml"
-## puppetdb
- $pt_bootstrap_conf = "${pt_puppetdb_main}/bootstrap.cfg"
- $pt_bootstrap_erb = 'puppet_cd/puppetdb/bootstrap.cfg.erb'
- $pt_puppetdb_access_log = "${pt_puppetdb_log}/puppetdb-access"
- $pt_request_logging_conf = "${pt_puppetdb_main}/request-logging.xml"
- $pt_request_logging_erb = 'puppet_cd/puppetdb/request_logging.xml.erb'
- $pt_logback_conf = "${pt_puppetdb_main}/logback.xml"
- $pt_logback_erb = 'puppet_cd/puppetdb/logback.xml.erb'
- $pt_puppetdb_config_ini = "${pt_puppetdb_conf_d}/config.ini"
- $pt_puppetdb_config_erb = 'puppet_cd/puppetdb/config.ini.erb'
- $pt_puppetdb_database_ini = "${pt_puppetdb_conf_d}/database.ini"
- $pt_puppetdb_database_erb = 'puppet_cd/puppetdb/database.ini.erb'
- $pt_puppetdb_jetty_ini = "${pt_puppetdb_conf_d}/jetty.ini"
- $pt_puppetdb_jetty_erb = 'puppet_cd/puppetdb/jetty.ini.erb'
- $pt_puppetdb_conf_file = "${pt_puppetdir}/puppetdb.conf"
- $pt_puppetdb_conf_erb = 'puppet_cd/puppetdb/puppetdb.conf.erb'
- $pt_puppetdb_repl_ini = "${pt_puppetdb_conf_d}/repl.ini"
- $pt_puppetdb_repl_erb = 'puppet_cd/puppetdb/repl.ini.erb'
- $pt_puppetdb_service_file = '/usr/lib/systemd/system/puppetdb.service'
- $pt_puppetdb_service_erb = 'puppet_cd/puppetdb/puppetdb_service.erb'
+
## r10k
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
$pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb'
@@ -1858,7 +1671,6 @@ class puppet_cd::params (
# service
$pt_server_service = 'puppetserver'
$pt_agent_service = 'puppet'
- $pt_db_service = 'puppetdb'
$pt_r10k_webhook_service = 'r10k_gitlab_webhook'
#