From befcc23b1d421bbcd310d52e74ea6cadd5a4731e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 24 Jul 2022 00:51:10 +0900
Subject: [PATCH] Revert "CentOS 9: Disable unit tests dependent on
 puppet-postgresql"

This reverts commit 20fec0749121b93189fd8a4195e21914982a3d30.

Reason for revert:
puppet-postgresql 8.1.0 was released and now the module supports RHEL 9
(and CentOS 9 effectively).

Note:
This change adds the service_provider fact in test fact data because
it is required by puppet-postgresql.

Depends-on: https://review.opendev.org/850705
Change-Id: I912189bb54c0116b0c3df9f68cb96b1b9659de53
---
 spec/classes/nova_db_postgresql_api_spec.rb | 10 ++++------
 spec/classes/nova_db_postgresql_spec.rb     | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/spec/classes/nova_db_postgresql_api_spec.rb b/spec/classes/nova_db_postgresql_api_spec.rb
index a2847b0f2..7f4a12a9c 100644
--- a/spec/classes/nova_db_postgresql_api_spec.rb
+++ b/spec/classes/nova_db_postgresql_api_spec.rb
@@ -32,15 +32,13 @@ describe 'nova::db::postgresql_api' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
-          :os_workers     => 8,
-          :concat_basedir => '/var/lib/puppet/concat'
+          # puppet-postgresql requires the service_provider fact provided by
+          # puppetlabs-postgresql.
+          :service_provider => 'systemd'
         }))
       end
 
-      # TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
-      unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
-        it_configures 'nova::db::postgresql'
-      end
+      it_configures 'nova::db::postgresql'
     end
   end
 
diff --git a/spec/classes/nova_db_postgresql_spec.rb b/spec/classes/nova_db_postgresql_spec.rb
index 98e2d0639..ad64d4ef0 100644
--- a/spec/classes/nova_db_postgresql_spec.rb
+++ b/spec/classes/nova_db_postgresql_spec.rb
@@ -50,15 +50,13 @@ describe 'nova::db::postgresql' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
-          :os_workers     => 8,
-          :concat_basedir => '/var/lib/puppet/concat'
+          # puppet-postgresql requires the service_provider fact provided by
+          # puppetlabs-postgresql.
+          :service_provider => 'systemd'
         }))
       end
 
-      # TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
-      unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
-        it_configures 'nova::db::postgresql'
-      end
+      it_configures 'nova::db::postgresql'
     end
   end