openstack
/
cookbook-openstack-image
Code Issues Proposed changes

Restart glance immediately 

Since glance could be used to upload images,
make sure it's restarted immediately within the recipe.

Change-Id: Ie4a742a2a8aaeeec2886fcc0513e654d0237997c
This commit is contained in:
Mark Vanderwiel 2016-04-07 10:23:32 -05:00
parent 0efcf40fd3
commit a2ee560a2b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/api.rb
View File

@ -190,5 +190,5 @@ service 'glance-api' do
'template[/etc/glance/glance-scrubber.conf]', 'template[/etc/glance/glance-scrubber.conf]',
'template[/etc/glance/glance-cache.conf]', 'template[/etc/glance/glance-cache.conf]',
'template[/etc/glance/glance-api.conf]' 'template[/etc/glance/glance-api.conf]'
] ], :immediately
end end

2
recipes/registry.rb
View File

@ -129,5 +129,5 @@ service 'glance-registry' do
service_name platform_options['image_registry_service'] service_name platform_options['image_registry_service']
supports status: true, restart: true supports status: true, restart: true
action [:enable, :start] action [:enable, :start]
subscribes :restart, 'template[/etc/glance/glance-registry.conf]' subscribes :restart, 'template[/etc/glance/glance-registry.conf]', :immediately
end end

6
spec/api_spec.rb
View File

@ -229,9 +229,9 @@ describe 'openstack-image::api' do
it do it do
resource = chef_run.service('glance-api') resource = chef_run.service('glance-api')
expect(resource).to subscribe_to('template[/etc/glance/glance-api.conf]') expect(resource).to subscribe_to('template[/etc/glance/glance-api.conf]').on(:restart).immediately
expect(resource).to subscribe_to('template[/etc/glance/glance-cache.conf]') expect(resource).to subscribe_to('template[/etc/glance/glance-cache.conf]').on(:restart).immediately
expect(resource).to subscribe_to('template[/etc/glance/glance-scrubber.conf]') expect(resource).to subscribe_to('template[/etc/glance/glance-scrubber.conf]').on(:restart).immediately
end end
end end
end end

2
spec/registry_spec.rb
View File

@ -151,7 +151,7 @@ describe 'openstack-image::registry' do
it do it do
resource = chef_run.service('glance-registry') resource = chef_run.service('glance-registry')
expect(resource).to subscribe_to('template[/etc/glance/glance-registry.conf]') expect(resource).to subscribe_to('template[/etc/glance/glance-registry.conf]').on(:restart).immediately
end end
end end
end end