openstack/puppet-manila
Code Issues Proposed changes

Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql"

Browse Source 
This reverts commit a8fa9f2788e269306964cb235b69121f8acdd6ea.

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.
This also reverts commit a36a020f47063f561605c6e33b3c4574e643e9ca which
fixed the typo in the original commit.

Depends-on: https://review.opendev.org/850705
Change-Id: Icf69dc0461e3171d55e9583e0164d450477f68c1
This commit is contained in:
Takashi Kajinami 2022-07-24 00:44:50 +09:00
parent cbac1af980
commit 56d07186d8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spec/classes/manila_db_postgresql_spec.rb
View File

@ -34,14 +34,13 @@ describe 'manila::db::postgresql' do
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({
: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 'manila::db::postgresql'
end
it_configures 'manila::db::postgresql'
end
end