Merge pull request #1 from paxri01/feature/metadata_update

Feature/metadata update

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Release notes for the puppetlabs-puppetdb module.
 
+#### 7.12.1 - 2023/05/20
+* Enable manage_dnf_module parameter for postgresql
+
 #### 7.12.0 - 2022/12/13
 * Grant read role to write user to fix database user permissions issue
   [PDB-5559](https://tickets.puppetlabs.com/browse/PDB-5559)

README.md

@@ -961,6 +961,11 @@ be installed from the regular repository. Defaults to `true`.
 If the postgresql.org repo is installed, you can install several versions of
 postgres. Defaults to `9.6` in module version 6.0+ and `9.4` in older versions.
 
+#### `manage_dnf_module`
+
+If `true`, enable specified postgresql version appstream for EL 8 systems. Also
+override $server_package_name within postgresql module.  Defaults to false.
+
 Implementation
 ---------------
 

manifests/database/postgresql.pp

@@ -8,6 +8,7 @@
   $database_password           = $puppetdb::params::database_password,
   $database_port               = $puppetdb::params::database_port,
   $manage_database             = $puppetdb::params::manage_database,
+  $manage_dnf_module           = $puppetdb::params::manage_dnf_module,
   $manage_server               = $puppetdb::params::manage_dbserver,
   $manage_package_repo         = $puppetdb::params::manage_pg_repo,
   $postgres_version            = $puppetdb::params::postgres_version,
@@ -22,6 +23,7 @@
 
   if $manage_server {
     class { '::postgresql::globals':
+      manage_dnf_module   => $manage_dnf_module,
       manage_package_repo => $manage_package_repo,
       version             => $postgres_version,
     }

manifests/init.pp

@@ -90,6 +90,7 @@
   String[1] $cleanup_timer_interval        = $puppetdb::params::cleanup_timer_interval,
   Integer[1] $dlo_max_age                  = $puppetdb::params::dlo_max_age,
   Optional[Stdlib::Absolutepath] $java_bin = $puppetdb::params::java_bin,
+  Boolean  $manage_dnf_module              = $puppetdb::params::manage_dnf_module
 ) inherits puppetdb::params {
 
   class { '::puppetdb::server':
@@ -192,6 +193,7 @@
       database_port               => $database_port,
       manage_server               => $manage_dbserver,
       manage_database             => $manage_database,
+      manage_dnf_module           => $manage_dnf_module,
       manage_package_repo         => $manage_package_repo,
       postgres_version            => $postgres_version,
       postgresql_ssl_on           => $postgresql_ssl_on,

manifests/params.pp

@@ -18,6 +18,7 @@
   $database                  = $puppetdb::globals::database
   $manage_dbserver           = true
   $manage_database           = true
+  $manage_dnf_module         = false
 
   if fact('os.family') =~ /RedHat|Debian/ {
     $manage_pg_repo            = true

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-puppetdb",
-  "version": "7.12.0",
+  "version": "7.12.1",
   "author": "puppetlabs",
   "summary": "Installs PostgreSQL and PuppetDB, sets up the connection to Puppet master.",
   "license": "Apache-2.0",
@@ -10,15 +10,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/inifile",
-      "version_requirement": ">= 1.1.3 < 6.0.0"
+      "version_requirement": ">= 1.1.3 < 7.0.0"
     },
     {
       "name": "puppetlabs/postgresql",
-      "version_requirement": ">= 6.5.0 < 9.0.0"
-    },
-    {
-      "name": "puppetlabs/firewall",
-      "version_requirement": ">= 1.1.3 < 4.0.0"
+      "version_requirement": ">= 6.5.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
@@ -29,31 +25,27 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "6",
         "7"
       ]
     },
@@ -66,7 +58,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8",
         "9",
         "10",
         "11"