confdroid/confdroid_puppet
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jenkins-build-81' into 'master'

Browse Source 
Auto-merge for build 81

See merge request puppet/puppet_cd!77
This commit is contained in:
Jenkins
2025-10-27 22:41:21 +00:00
parent 2ec276e9fb 792b351cd9
commit 361211d176
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/puppet_classes/puppet_cd_3A_3Aparams.html
View File

@@ -168,7 +168,7 @@
<li> <li>
<span class='name'>pt_db_fqdn</span> <span class='name'>pt_puppetdb_fqdn</span>
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
@@ -1106,7 +1106,7 @@ class puppet_cd::params (
Boolean $pt_manage_fw = true, Boolean $pt_manage_fw = true,
String $pt_pm_fqdn = &#39;puppetmaster.example.net&#39;, String $pt_pm_fqdn = &#39;puppetmaster.example.net&#39;,
String $pt_db_fqdn = &#39;puppetdb.example.net&#39;, String $pt_puppetdb_fqdn = &#39;puppetdb.example.net&#39;,
Boolean $pt_use_puppetdb = false, Boolean $pt_use_puppetdb = false,
# installation # installation

4
manifests/params.pp
View File

@@ -6,7 +6,7 @@
# @param [Boolean] pt_use_puppetdb whether to use puppetdb # @param [Boolean] pt_use_puppetdb whether to use puppetdb
# @param [String] pt_pm_fqdn the fqdn for the puppetmaster and master # @param [String] pt_pm_fqdn the fqdn for the puppetmaster and master
# settings are applied. any other fqdn # will be considered a puppet agent. # settings are applied. any other fqdn # will be considered a puppet agent.
# @param [String] pt_db_fqdn the fqdn for the puppetdb node. # @param [String] pt_puppetdb_fqdn the fqdn for the puppetdb node.
# @param [String] pt_pkg_ensure valid: "present", "latest", "v1.2.3" # @param [String] pt_pkg_ensure valid: "present", "latest", "v1.2.3"
# @param [String] pt_agent_pkg the packages for agents to install # @param [String] pt_agent_pkg the packages for agents to install
# @param [String] pt_server_pkg the server packages to install # @param [String] pt_server_pkg the server packages to install
@@ -58,7 +58,7 @@ class puppet_cd::params (
Boolean $pt_manage_fw = true, Boolean $pt_manage_fw = true,
String $pt_pm_fqdn = 'puppetmaster.example.net', String $pt_pm_fqdn = 'puppetmaster.example.net',
String $pt_db_fqdn = 'puppetdb.example.net', String $pt_puppetdb_fqdn = 'puppetdb.example.net',
Boolean $pt_use_puppetdb = false, Boolean $pt_use_puppetdb = false,
# installation # installation

2
templates/puppetdb/puppetdb.conf.erb
View File

@@ -4,5 +4,5 @@
########## puppetdb.conf managed by puppet agent ########## ########## puppetdb.conf managed by puppet agent ##########
############################################################################### ###############################################################################
[main] [main]
server_urls = https://<%= @pt_db_fqdn%>:<%= @pt_ssl_port %> server_urls = https://<%= @pt_puppetdb_fqdn %>:<%= @pt_ssl_port %>
soft_write_failure = <%= @pt_soft_write_failure %> soft_write_failure = <%= @pt_soft_write_failure %>