WIP

Author: ekohl

manifests/globals.pp

@@ -269,7 +269,9 @@
       proxy   => $repo_proxy,
       baseurl => $repo_baseurl,
     }
-  } elsif $manage_dnf_module {
+  }
+
+  if $manage_dnf_module {
     class { 'postgresql::dnfmodule':
       ensure => $globals_version,
     }

manifests/params.pp

@@ -41,7 +41,7 @@
       $version_parts      = split($version, '[.]')
       $package_version    = "${version_parts[0]}${version_parts[1]}"
 
-      if $version == $postgresql::globals::default_version and $facts['os']['name'] != 'Amazon' {
+      if $version == $postgresql::globals::default_version and $facts['os']['name'] != 'Amazon' or $postgresql::globals::manage_dnf_module {
         $client_package_name    = pick($client_package_name, 'postgresql')
         $server_package_name    = pick($server_package_name, 'postgresql-server')
         $contrib_package_name   = pick($contrib_package_name,'postgresql-contrib')

spec/unit/classes/server_spec.rb

@@ -36,6 +36,20 @@
   end
 
   describe 'with manage_dnf_module true' do
+    let(:facts) do
+      {
+        os: {
+          family: 'RedHat',
+          name: 'RedHat',
+          release: { 'full' => '8.3', 'major' => '8' },
+          selinux: {
+            enabled: true,
+          }
+        },
+        osfamily: 'RedHat',
+      }
+    end
+
     let(:pre_condition) do
       <<-PUPPET
       class { 'postgresql::globals':
@@ -44,7 +58,22 @@ class { 'postgresql::globals':
       PUPPET
     end
 
-    it { is_expected.to contain_package('postgresql dnf module').that_comes_before('Package[postgresql-server]') }
+    it { is_expected.to contain_package('postgresql dnf module').with_ensure('10').that_comes_before('Package[postgresql-server]') }
+    it { is_expected.to contain_package('postgresql-server').with_name('postgresql-server') }
+
+    describe 'with version set' do
+      let(:pre_condition) do
+        <<-PUPPET
+        class { 'postgresql::globals':
+          manage_dnf_module => true,
+          version           => '12',
+        }
+        PUPPET
+      end
+
+      it { is_expected.to contain_package('postgresql dnf module').with_ensure('12').that_comes_before('Package[postgresql-server]') }
+      it { is_expected.to contain_package('postgresql-server').with_name('postgresql-server') }
+    end
   end
 
   describe 'service_ensure => running' do