3
0
Arne Teuke
2025-10-26 17:47:09 +01:00
parent f78a50e1b3
commit 9a451fba89
4 changed files with 11 additions and 17 deletions

View File

@@ -15,6 +15,7 @@
"levelname", "levelname",
"logappender", "logappender",
"NOFILE", "NOFILE",
"Puppetfile",
"pydantic", "pydantic",
"pylint", "pylint",
"pytest", "pytest",

View File

@@ -7,7 +7,7 @@
## Synopsis ## Synopsis
This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle. This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle.
The syntax etc is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. 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 module is also designed to work with External Node Classifiers (ENC), for instance Foreman.
## WARNING ## WARNING
@@ -16,11 +16,16 @@ This module is also designed to work with External Node Classifiers (ENC), for i
## Features ## Features
* install packages depending on whether the host fqdn equals either master fqdn, db fqdn or none (agent). * 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_r10k`to `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_webhook`to `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 * open firewall ports depending on fqdn choices
* start services as required * start services as required
* manage directories * manage directories
* manage user settings (optional) * manage puppet user settings (optional)
## Support ## Support

View File

@@ -6,10 +6,10 @@
class puppet_cd::puppetdb::service ( class puppet_cd::puppetdb::service (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) { if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) {
require puppet_cd::puppetdb::files require puppet_cd::puppetdb::files
service { $pt_puppetdb: service { $pt_db_service:
ensure => running, ensure => running,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,

View File

@@ -29,18 +29,6 @@ class puppet_cd::server::service (
} }
} }
# manage puppetdb service
if $fqdn == $pt_db_fqdn {
require puppet_cd::firewall::iptables
service { $pt_db_service:
ensure => running,
hasstatus => true,
hasrestart => true,
enable => true,
}
}
# manage webhook service # manage webhook service
if $pt_use_r10k_webhook == true { if $pt_use_r10k_webhook == true {
require puppet_cd::r10k::install require puppet_cd::r10k::install