openstack/puppet-ironic
Code Issues Proposed changes

Explicitly install inspector-dnsmasq package

Browse Source 
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:
yatinkarel
2020-04-29 12:13:17 +05:30
parent 7524a9d02f
commit b1ea700ba8
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/inspector.pp
View File

@@ -424,9 +424,8 @@ Use ironic::inspector::ironic::endpoint_override instead.')
# Install package # Install package
if $::ironic::params::inspector_package { if $::ironic::params::inspector_package {
package { 'ironic-inspector': package { $::ironic::params::inspector_package:
ensure => $package_ensure, ensure => $package_ensure,
name => $::ironic::params::inspector_package,
tag => ['openstack', 'ironic-inspector-package'], tag => ['openstack', 'ironic-inspector-package'],
} }
} }

2
manifests/params.pp
View File

@@ -53,7 +53,7 @@ class ironic::params {
$api_service = 'openstack-ironic-api' $api_service = 'openstack-ironic-api'
$conductor_package = 'openstack-ironic-conductor' $conductor_package = 'openstack-ironic-conductor'
$conductor_service = '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_service = 'openstack-ironic-inspector'
$inspector_dnsmasq_service = 'openstack-ironic-inspector-dnsmasq' $inspector_dnsmasq_service = 'openstack-ironic-inspector-dnsmasq'
$staging_drivers_package = 'openstack-ironic-staging-drivers' $staging_drivers_package = 'openstack-ironic-staging-drivers'

1
spec/classes/ironic_inspector_spec.rb
View File

@@ -84,7 +84,6 @@ describe 'ironic::inspector' do
it 'installs ironic inspector package' do it 'installs ironic inspector package' do
if platform_params.has_key?(:inspector_package) if platform_params.has_key?(:inspector_package)
is_expected.to contain_package('ironic-inspector').with( is_expected.to contain_package('ironic-inspector').with(
:name => platform_params[:inspector_package],
:ensure => p[:package_ensure], :ensure => p[:package_ensure],
:tag => ['openstack', 'ironic-inspector-package'], :tag => ['openstack', 'ironic-inspector-package'],
) )