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

Auto-merge for build 64

See merge request puppet/puppet_cd!60

.vscode/settings.json

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

README.md

@@ -7,7 +7,7 @@
 ## Synopsis
 
 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.
 
 ## WARNING
@@ -16,11 +16,16 @@ This module is also designed to work with External Node Classifiers (ENC), for i
 
 ## 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
 * start services as required
 * manage directories
-* manage user settings (optional)
+* manage puppet user settings (optional)
 
 ## Support
 

doc/file.README.html

@@ -66,7 +66,7 @@
 
 <h2 id="label-Synopsis">Synopsis</h2>
 
-<p>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. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.</p>
+<p>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.</p>
 
 <h2 id="label-WARNING">WARNING</h2>
 
@@ -74,7 +74,9 @@
 
 <h2 id="label-Features">Features</h2>
 <ul><li>
-<p>install packages depending on whether the host fqdn equals either master fqdn, db fqdn or none (agent).</p>
+<p>if the host FQDN matches your specified Puppet master via <code>$pt_pm_fqdn</code>, it installs and configures a puppetmaster. On your puppetmaster, If you set <code>$pt_use_r10k</code>to <code>true</code>, it also installs r10k to connect to a control repo and manage the code available to clients via Puppetfile. If you set <code>$pt_use_r10k_webhook</code>to <code>true</code>, it also installs a simple webhook listener to watch for post_hooks from gitlab, and triggers the r10k deployment.</p>
+</li><li>
+<p>if the host FQDN matches your specified puppetdb host via <code>$pt_db_fqdn</code>, Puppetdb is installed and added to the puppetmaster config. Settings for the (external) postgreSQL database are also configured.</p>
 </li><li>
 <p>open firewall ports depending on fqdn choices</p>
 </li><li>
@@ -82,7 +84,7 @@
 </li><li>
 <p>manage directories</p>
 </li><li>
-<p>manage user settings (optional)</p>
+<p>manage puppet user settings (optional)</p>
 </li></ul>
 
 <h2 id="label-Support">Support</h2>

doc/index.html

@@ -66,7 +66,7 @@
 
 <h2 id="label-Synopsis">Synopsis</h2>
 
-<p>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. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.</p>
+<p>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.</p>
 
 <h2 id="label-WARNING">WARNING</h2>
 
@@ -74,7 +74,9 @@
 
 <h2 id="label-Features">Features</h2>
 <ul><li>
-<p>install packages depending on whether the host fqdn equals either master fqdn, db fqdn or none (agent).</p>
+<p>if the host FQDN matches your specified Puppet master via <code>$pt_pm_fqdn</code>, it installs and configures a puppetmaster. On your puppetmaster, If you set <code>$pt_use_r10k</code>to <code>true</code>, it also installs r10k to connect to a control repo and manage the code available to clients via Puppetfile. If you set <code>$pt_use_r10k_webhook</code>to <code>true</code>, it also installs a simple webhook listener to watch for post_hooks from gitlab, and triggers the r10k deployment.</p>
+</li><li>
+<p>if the host FQDN matches your specified puppetdb host via <code>$pt_db_fqdn</code>, Puppetdb is installed and added to the puppetmaster config. Settings for the (external) postgreSQL database are also configured.</p>
 </li><li>
 <p>open firewall ports depending on fqdn choices</p>
 </li><li>
@@ -82,7 +84,7 @@
 </li><li>
 <p>manage directories</p>
 </li><li>
-<p>manage user settings (optional)</p>
+<p>manage puppet user settings (optional)</p>
 </li></ul>
 
 <h2 id="label-Support">Support</h2>

doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html

@@ -122,10 +122,10 @@
 class puppet_cd::puppetdb::service (
 
 ) 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
 
-    service { $pt_puppetdb:
+    service { $pt_db_service:
       ensure     => running,
       hasstatus  => true,
       hasrestart => true,

doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html

@@ -137,19 +137,7 @@
 39
 40
 41
-42
+42</pre>
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -180,18 +168,6 @@ class puppet_cd::server::service (
     }
   }
 
-  # manage puppetdb service
-  if $fqdn == $pt_db_fqdn {
-    require puppet_cd::firewall::iptables
-
-    service { $pt_db_service:
-      ensure     =&gt; running,
-      hasstatus  =&gt; true,
-      hasrestart =&gt; true,
-      enable     =&gt; true,
-    }
-  }
-
   # manage webhook service
   if $pt_use_r10k_webhook == true {
     require puppet_cd::r10k::install

manifests/puppetdb/service.pp

@@ -6,10 +6,10 @@
 class puppet_cd::puppetdb::service (
 
 ) 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
 
-    service { $pt_puppetdb:
+    service { $pt_db_service:
       ensure     => running,
       hasstatus  => true,
       hasrestart => true,

manifests/server/service.pp

@@ -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
   if $pt_use_r10k_webhook == true {
     require puppet_cd::r10k::install