diff --git a/manifests/inspector.pp b/manifests/inspector.pp index a633be6a..a215a9a0 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -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'], } } diff --git a/manifests/params.pp b/manifests/params.pp index b6e26105..be50d022 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' diff --git a/spec/classes/ironic_inspector_spec.rb b/spec/classes/ironic_inspector_spec.rb index dcc2eacd..8a757147 100644 --- a/spec/classes/ironic_inspector_spec.rb +++ b/spec/classes/ironic_inspector_spec.rb @@ -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'], )