Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql"
This reverts commit 20fec07491.
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
This commit is contained in:
@@ -32,16 +32,14 @@ describe 'nova::db::postgresql_api' do
|
|||||||
context "on #{os}" do
|
context "on #{os}" do
|
||||||
let (:facts) do
|
let (:facts) do
|
||||||
facts.merge(OSDefaults.get_facts({
|
facts.merge(OSDefaults.get_facts({
|
||||||
:os_workers => 8,
|
# puppet-postgresql requires the service_provider fact provided by
|
||||||
:concat_basedir => '/var/lib/puppet/concat'
|
# puppetlabs-postgresql.
|
||||||
|
:service_provider => 'systemd'
|
||||||
}))
|
}))
|
||||||
end
|
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'
|
it_configures 'nova::db::postgresql'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -50,16 +50,14 @@ describe 'nova::db::postgresql' do
|
|||||||
context "on #{os}" do
|
context "on #{os}" do
|
||||||
let (:facts) do
|
let (:facts) do
|
||||||
facts.merge(OSDefaults.get_facts({
|
facts.merge(OSDefaults.get_facts({
|
||||||
:os_workers => 8,
|
# puppet-postgresql requires the service_provider fact provided by
|
||||||
:concat_basedir => '/var/lib/puppet/concat'
|
# puppetlabs-postgresql.
|
||||||
|
:service_provider => 'systemd'
|
||||||
}))
|
}))
|
||||||
end
|
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'
|
it_configures 'nova::db::postgresql'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user