Merge "Debian/Ubuntu: The staging driver package is not available"

This commit is contained in:
Zuul 2022-07-11 09:21:08 +00:00 committed by Gerrit Code Review
commit bdf6b66ae1
2 changed files with 12 additions and 10 deletions

View File

@ -15,10 +15,13 @@ class ironic::drivers::staging (
include ironic::deps
include ironic::params
package { 'ironic-staging-drivers':
ensure => $package_ensure,
name => $::ironic::params::staging_drivers_package,
tag => ['openstack', 'ironic-support-package'],
if $::ironic::params::staging_drivers_package {
package { 'ironic-staging-drivers':
ensure => $package_ensure,
name => $::ironic::params::staging_drivers_package,
tag => ['openstack', 'ironic-support-package'],
}
} else {
fail('This distribution does not provide the staging driver package.')
}
}

View File

@ -41,18 +41,17 @@ describe 'ironic::drivers::staging' do
end
end
# TODO: use OSDefaults.get_supported_os when ironic-staging-drivers is
# packaged for Debian and Ubuntu
on_supported_os({
:supported_os => [ { 'operatingsystem' => 'CentOS',
'operatingsystemrelease' => [ '7' ] } ]
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_configures 'ironic-staging-drivers'
if facts[:osfamily] == 'RedHat'
it_configures 'ironic-staging-drivers'
end
end
end