Merge pull request voxpupuli#9 from voxpupuli/openvox

use OpenVox packages when possible

Author: bastelfreak

.github/workflows/ci.yml

@@ -22,4 +22,4 @@ permissions:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v4
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4

REFERENCE.md

@@ -919,6 +919,7 @@ The following parameters are available in the `puppetdb::database::postgresql` c
 * [`listen_addresses`](#-puppetdb--database--postgresql--listen_addresses)
 * [`puppetdb_server`](#-puppetdb--database--postgresql--puppetdb_server)
 * [`database_name`](#-puppetdb--database--postgresql--database_name)
+* [`database_locale`](#-puppetdb--database--postgresql--database_locale)
 * [`database_username`](#-puppetdb--database--postgresql--database_username)
 * [`database_password`](#-puppetdb--database--postgresql--database_password)
 * [`database_port`](#-puppetdb--database--postgresql--database_port)
@@ -963,6 +964,14 @@ Sets the name of the database. Defaults to `puppetdb`.
 
 Default value: `$puppetdb::params::database_name`
 
+##### <a name="-puppetdb--database--postgresql--database_locale"></a>`database_locale`
+
+Data type: `Any`
+
+Sets the locale of the database. Defaults to `C.UTF-8`.
+
+Default value: `$puppetdb::params::database_locale`
+
 ##### <a name="-puppetdb--database--postgresql--database_username"></a>`database_username`
 
 Data type: `Any`

manifests/database/postgresql.pp

@@ -12,6 +12,9 @@
 # @param database_name
 #   Sets the name of the database. Defaults to `puppetdb`.
 #
+# @param database_locale
+#   Sets the locale of the database. Defaults to `C.UTF-8`.
+#
 # @param database_username
 #   Creates a user for access the database. Defaults to `puppetdb`.
 #
@@ -74,6 +77,7 @@
   $listen_addresses            = $puppetdb::params::database_host,
   $puppetdb_server             = $puppetdb::params::puppetdb_server,
   $database_name               = $puppetdb::params::database_name,
+  $database_locale = $puppetdb::params::database_locale,
   $database_username           = $puppetdb::params::database_username,
   Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
   $database_port               = $puppetdb::params::database_port,
@@ -150,7 +154,7 @@
       user     => $database_username,
       password => $database_password,
       encoding => 'UTF8',
-      locale   => 'en_US.UTF-8',
+      locale   => $database_locale,
       grant    => 'all',
       port     => $port,
     }

manifests/params.pp

@@ -35,6 +35,7 @@
   $database_host          = 'localhost'
   $database_port          = '5432'
   $database_name          = 'puppetdb'
+  $database_locale        = 'C.UTF-8'
   $database_username      = 'puppetdb'
   $database_password      = 'puppetdb'
   $manage_db_password     = true
@@ -113,30 +114,38 @@
     $test_url         = '/v3/version'
   } else {
     case fact('os.family') {
-      'RedHat', 'Suse', 'Archlinux','Debian': {
+      'Archlinux': {
         $puppetdb_package    = 'puppetdb'
         $terminus_package    = 'puppetdb-termini'
         $etcdir              = '/etc/puppetlabs/puppetdb'
         $puppet_confdir      = pick($puppetdb::globals::puppet_confdir,'/etc/puppetlabs/puppet')
         $puppet_service_name = 'puppetserver'
         $vardir              = '/opt/puppetlabs/server/data/puppetdb'
       }
-      'OpenBSD': {
-        $puppetdb_package    = 'puppetdb'
-        $terminus_package    = 'puppetdb-termini'
+      'Debian', 'RedHat', 'Suse': {
+        $puppetdb_package    = 'openvoxdb'
+        $terminus_package    = 'openvoxdb-termini'
         $etcdir              = '/etc/puppetlabs/puppetdb'
         $puppet_confdir      = pick($puppetdb::globals::puppet_confdir,'/etc/puppetlabs/puppet')
-        $puppet_service_name = undef
+        $puppet_service_name = 'puppetserver'
         $vardir              = '/opt/puppetlabs/server/data/puppetdb'
       }
       'FreeBSD': {
-        $puppetdb_package    = inline_epp('puppetdb<%= $puppetdb::params::puppetdb_major_version %>')
-        $terminus_package    = inline_epp('puppetdb-terminus<%= $puppetdb::params::puppetdb_major_version %>')
+        $puppetdb_package    = "openvoxdb-${puppetdb::params::puppetdb_major_version}"
+        $terminus_package    = "openvoxdb-terminus-${puppetdb::params::puppetdb_major_version}"
         $etcdir              = '/usr/local/etc/puppetdb'
         $puppet_confdir      = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppet')
         $puppet_service_name = 'puppetserver'
         $vardir              = '/var/db/puppetdb'
       }
+      'OpenBSD': {
+        $puppetdb_package    = 'puppetdb'
+        $terminus_package    = 'puppetdb-termini'
+        $etcdir              = '/etc/puppetlabs/puppetdb'
+        $puppet_confdir      = pick($puppetdb::globals::puppet_confdir,'/etc/puppetlabs/puppet')
+        $puppet_service_name = undef
+        $vardir              = '/opt/puppetlabs/server/data/puppetdb'
+      }
       default: {
         fail("The fact 'os.family' is set to ${fact('os.family')} which is not supported by the puppetdb module.")
       }

spec/support/acceptance/shared/puppetdb.rb

@@ -3,18 +3,6 @@
 shared_examples 'puppetdb' do
   let(:pp) do
     <<~PP
-      if $facts['os']['family'] == 'RedHat' {
-        # Work-around EL systemd in docker bug affecting forked services
-        file_line { 'puppetdb-unit-remove-pidfile':
-          path               => '/lib/systemd/system/puppetdb.service',
-          line               => '#PIDFile=/run/puppetlabs/puppetdb/puppetdb.pid',
-          match              => '^PIDFile.*',
-          append_on_no_match => false,
-          require            => Package['puppetdb'],
-          notify             => Service['puppetdb'],
-        }
-      }
-
       # reduce pgs memory
       postgresql::server::config_entry { 'max_connections': value => '20' }
       postgresql::server::config_entry { 'shared_buffers': value => '128kB' }

spec/support/acceptance/shared/puppetserver.pp

@@ -24,40 +24,27 @@
     -> Package['disable-dnf-postgresql-module']
     -> Package <| tag == 'postgresql' |>
   }
-
-  # Work-around EL systemd in docker with cgroupsv1? issue and forked services
-  # Without this, the puppet agent will stall for 300 seconds waiting for
-  # the service to start... then miserably fail.
-  # systemd error message:
-  #     New main PID 1411 does not belong to service, and PID file is not
-  #     owned by root. Refusing.
-  # PIDFile is not needed, but it cannot be reset by a drop-in, therefor the
-  # original unit must be modified
-  file_line { 'puppetserver-unit-remove-pidfile':
-    path               => '/lib/systemd/system/puppetserver.service',
-    line               => '#PIDFile=/run/puppetlabs/puppetserver.pid',
-    match              => '^PIDFile.*',
-    append_on_no_match => false,
-    require            => Package['puppetserver'],
-    notify             => Service['puppetserver'],
-  }
 }
 
 $sysconfdir = $facts['os']['family'] ? {
   'Debian' => '/etc/default',
   default  => '/etc/sysconfig',
 }
 
-package { 'puppetserver':
-  ensure => installed,
+case fact('os.family') {
+  'Archlinux': {
+    $puppetserver_package = 'puppetserver'
+  }
+  'Debian', 'RedHat', 'Suse': {
+    $puppetserver_package = 'openvox-server'
+  }
+  default: {
+    fail("The fact 'os.family' is set to ${fact('os.family')} which is not supported by the puppetdb module.")
+  }
 }
-# savagely disable dropsonde
-~> file {
-  [
-    '/opt/puppetlabs/server/data/puppetserver/dropsonde/bin/dropsonde',
-    '/opt/puppetlabs/server/apps/puppetserver/cli/apps/dropsonde',
-  ]:
-    ensure => absent,
+
+package { $puppetserver_package:
+  ensure => installed,
 }
 -> exec { '/opt/puppetlabs/bin/puppetserver ca setup':
   creates => '/etc/puppetlabs/puppetserver/ca/ca_crt.pem',

spec/unit/classes/database/postgresql_spec.rb

@@ -63,7 +63,7 @@
             grant:    'all',
             port:     params[:database_port].to_i,
             encoding: 'UTF8',
-            locale:   'en_US.UTF-8'
+            locale:   'C.UTF-8'
           )
       }
 

spec/unit/classes/master/config_spec.rb

@@ -7,6 +7,15 @@
     context "on #{os}" do
       let(:facts) { facts }
 
+      let(:termini_package_name) do
+        case facts[:os]['family']
+        when 'Archlinux', 'OpenBSD'
+          'puppetdb-termini'
+        when 'Debian', 'RedHat', 'Suse'
+          'openvoxdb-termini'
+        end
+      end
+
       context 'when PuppetDB on remote server' do
         context 'when using default values' do
           it { is_expected.to compile.with_all_deps }
@@ -62,7 +71,7 @@
         end
 
         context 'when using default values' do
-          it { is_expected.to contain_package('puppetdb-termini').with(ensure: 'present') }
+          it { is_expected.to contain_package(termini_package_name).with(ensure: 'present') }
           it { is_expected.to contain_puppetdb_conn_validator('puppetdb_conn').with(test_url: '/pdb/meta/v1/version') }
         end
 

spec/unit/classes/server_spec.rb

@@ -14,6 +14,15 @@
     end
   end
 
+  let(:package_name) do
+    case facts[:os]['family']
+    when 'Archlinux', 'OpenBSD'
+      'puppetdb'
+    when 'Debian', 'RedHat', 'Suse'
+      'openvoxdb'
+    end
+  end
+
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) { facts }
@@ -28,7 +37,7 @@
         it { is_expected.to contain_class('puppetdb::server::puppetdb') }
 
         it {
-          is_expected.to contain_package('puppetdb').
+          is_expected.to contain_package(package_name).
             that_notifies('Service[puppetdb]')
         }