Ironic conductor requires ipmitool command

Need to install the ipmitool package for conductor. Also
no need to notify or subscribe immediate for package
updates, that just causes the service to restart several times
when the all the packages have not yet been installed.

Change-Id: Ie5d33224f71e154ac904dcb0568ab2970e1f1647
Closes-Bug: #1454770

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']
   }

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
 

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

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
 

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