Explicitly install inspector-dnsmasq package
The package used to be implicitly pulled before [1], now this needs to be installed explicitly. Changed inspector_package param to contain list of packages to install and adopted package module to handle list of packages. [1] https://review.rdoproject.org/r/#/c/23761/ Change-Id: I2435b476b65be5aab6e35bad0834e60dc9c8ced5
This commit is contained in:
parent
7524a9d02f
commit
b1ea700ba8
@ -424,9 +424,8 @@ Use ironic::inspector::ironic::endpoint_override instead.')
|
||||
|
||||
# Install package
|
||||
if $::ironic::params::inspector_package {
|
||||
package { 'ironic-inspector':
|
||||
package { $::ironic::params::inspector_package:
|
||||
ensure => $package_ensure,
|
||||
name => $::ironic::params::inspector_package,
|
||||
tag => ['openstack', 'ironic-inspector-package'],
|
||||
}
|
||||
}
|
||||
|
@ -53,7 +53,7 @@ class ironic::params {
|
||||
$api_service = 'openstack-ironic-api'
|
||||
$conductor_package = 'openstack-ironic-conductor'
|
||||
$conductor_service = 'openstack-ironic-conductor'
|
||||
$inspector_package = 'openstack-ironic-inspector'
|
||||
$inspector_package = ['openstack-ironic-inspector', 'openstack-ironic-inspector-dnsmasq']
|
||||
$inspector_service = 'openstack-ironic-inspector'
|
||||
$inspector_dnsmasq_service = 'openstack-ironic-inspector-dnsmasq'
|
||||
$staging_drivers_package = 'openstack-ironic-staging-drivers'
|
||||
|
@ -84,7 +84,6 @@ describe 'ironic::inspector' do
|
||||
it 'installs ironic inspector package' do
|
||||
if platform_params.has_key?(:inspector_package)
|
||||
is_expected.to contain_package('ironic-inspector').with(
|
||||
:name => platform_params[:inspector_package],
|
||||
:ensure => p[:package_ensure],
|
||||
:tag => ['openstack', 'ironic-inspector-package'],
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user