feat: use OpenVox packages when possible

Author: d1nuc0m

manifests/params.pp

@@ -113,30 +113,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    = inline_epp('openvoxdb<%= $puppetdb::params::puppetdb_major_version %>')
+        $terminus_package    = inline_epp('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

@@ -10,7 +10,7 @@
           line               => '#PIDFile=/run/puppetlabs/puppetdb/puppetdb.pid',
           match              => '^PIDFile.*',
           append_on_no_match => false,
-          require            => Package['puppetdb'],
+          require            => Package['openvoxdb'],
           notify             => Service['puppetdb'],
         }
       }

spec/support/acceptance/shared/puppetserver.pp

@@ -38,7 +38,7 @@
     line               => '#PIDFile=/run/puppetlabs/puppetserver.pid',
     match              => '^PIDFile.*',
     append_on_no_match => false,
-    require            => Package['puppetserver'],
+    require            => Package['openvox-server'],
     notify             => Service['puppetserver'],
   }
 }
@@ -48,7 +48,19 @@
   default  => '/etc/sysconfig',
 }
 
-package { 'puppetserver':
+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.")
+  }
+}
+
+package { $puppetserver_package:
   ensure => installed,
 }
 # savagely disable dropsonde

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]')
         }