diff --git a/attributes/default.rb b/attributes/default.rb index a30185a..5e61d4d 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -98,7 +98,7 @@ when 'fedora', 'rhel' default['openstack']['bare-metal']['platform'] = { 'ironic_api_packages' => ['openstack-ironic-api'], 'ironic_api_service' => 'openstack-ironic-api', - 'ironic_conductor_packages' => ['openstack-ironic-conductor', 'shellinabox'], + 'ironic_conductor_packages' => ['openstack-ironic-conductor', 'shellinabox', 'ipmitool'], 'ironic_conductor_service' => 'openstack-ironic-conductor', 'ironic_common_packages' => ['openstack-ironic-common', 'python-ironicclient'] } @@ -106,7 +106,7 @@ when 'debian' default['openstack']['bare-metal']['platform'] = { 'ironic_api_packages' => ['ironic-api'], 'ironic_api_service' => 'ironic-api', - 'ironic_conductor_packages' => ['ironic-conductor', 'shellinabox'], + 'ironic_conductor_packages' => ['ironic-conductor', 'shellinabox', 'ipmitool'], 'ironic_conductor_service' => 'ironic-conductor', 'ironic_common_packages' => ['python-ironicclient', 'ironic-common'] } diff --git a/recipes/api.rb b/recipes/api.rb index 1f339fa..7e0e39d 100644 --- a/recipes/api.rb +++ b/recipes/api.rb @@ -30,7 +30,7 @@ platform_options['ironic_api_packages'].each do |pkg| package pkg do action :upgrade - notifies :restart, 'service[ironic-api]' + notifies :restart, 'service[ironic-api]', :delayed end end @@ -50,7 +50,7 @@ service 'ironic-api' do subscribes :restart, 'template[/etc/ironic/ironic.conf]' platform_options['ironic_common_packages'].each do |pkg| - subscribes :restart, "package[#{pkg}]" + subscribes :restart, "package[#{pkg}]", :delayed end end diff --git a/recipes/conductor.rb b/recipes/conductor.rb index e24bfd0..2341194 100644 --- a/recipes/conductor.rb +++ b/recipes/conductor.rb @@ -30,7 +30,7 @@ platform_options['ironic_conductor_packages'].each do |pkg| package pkg do action :upgrade - notifies :restart, 'service[ironic-conductor]' + notifies :restart, 'service[ironic-conductor]', :delayed end end @@ -43,6 +43,6 @@ service 'ironic-conductor' do subscribes :restart, 'template[/etc/ironic/ironic.conf]' platform_options['ironic_common_packages'].each do |pkg| - subscribes :restart, "package[#{pkg}]" + subscribes :restart, "package[#{pkg}]", :delayed end end diff --git a/spec/api_spec.rb b/spec/api_spec.rb index 934abb9..ea253e8 100644 --- a/spec/api_spec.rb +++ b/spec/api_spec.rb @@ -40,7 +40,7 @@ describe 'openstack-bare-metal::api' do let(:package) { chef_run.package('ironic-api') } it 'sends a notification to the service' do - expect(package).to notify('service[ironic-api]').to(:restart) + expect(package).to notify('service[ironic-api]').to(:restart).delayed end end @@ -64,7 +64,7 @@ describe 'openstack-bare-metal::api' do end it 'subscribes to the common packages' do - expect(service).to subscribe_to('package[python-ironicclient]') + expect(service).to subscribe_to('package[python-ironicclient]').delayed end end diff --git a/spec/conductor_spec.rb b/spec/conductor_spec.rb index 0235743..04deaee 100644 --- a/spec/conductor_spec.rb +++ b/spec/conductor_spec.rb @@ -33,7 +33,7 @@ describe 'openstack-bare-metal::conductor' do end it 'upgrades ironic conductor packages' do - %w(ironic-conductor shellinabox).each do |pkg| + %w(ironic-conductor shellinabox ipmitool).each do |pkg| expect(chef_run).to upgrade_package(pkg) end end @@ -42,7 +42,7 @@ describe 'openstack-bare-metal::conductor' do let(:package) { chef_run.package('ironic-conductor') } it 'sends a notification to the service' do - expect(package).to notify('service[ironic-conductor]').to(:restart) + expect(package).to notify('service[ironic-conductor]').to(:restart).delayed end end @@ -58,7 +58,7 @@ describe 'openstack-bare-metal::conductor' do end it 'subscribes to the common packages' do - expect(service).to subscribe_to('package[python-ironicclient]') + expect(service).to subscribe_to('package[python-ironicclient]').delayed end end end