create cache dirs for api and registy
* current logic with 'directory ::File.dirname node.attr' will create resources with the same name 'directory '/var/cache/glance', but different parameters (so only the first one will be executed) (recipes/api and /registry) * fixed logic and specs to actually use the full node attributes and create the two caching directories Change-Id: I6289bf7a8b7b1a998ad4cefef04021ec02fe4172
This commit is contained in:
parent
85afa26821
commit
6905c719b9
|
@ -91,10 +91,11 @@ directory '/etc/glance' do
|
|||
mode 00700
|
||||
end
|
||||
|
||||
directory ::File.dirname node['openstack']['image']['api']['auth']['cache_dir'] do
|
||||
directory node['openstack']['image']['api']['auth']['cache_dir'] do
|
||||
owner node['openstack']['image']['user']
|
||||
group node['openstack']['image']['group']
|
||||
mode 00700
|
||||
recursive true
|
||||
end
|
||||
|
||||
glance = node['openstack']['image']
|
||||
|
|
|
@ -79,10 +79,11 @@ platform_options['image_packages'].each do |pkg|
|
|||
end
|
||||
end
|
||||
|
||||
directory ::File.dirname(node['openstack']['image']['registry']['auth']['cache_dir']) do
|
||||
directory node['openstack']['image']['registry']['auth']['cache_dir'] do
|
||||
owner glance_user
|
||||
group glance_group
|
||||
mode 00700
|
||||
recursive true
|
||||
end
|
||||
|
||||
service 'glance-registry' do
|
||||
|
|
|
@ -31,10 +31,17 @@ describe 'openstack-image::api' do
|
|||
include_context 'image-stubs'
|
||||
include_examples 'common-logging-recipe'
|
||||
include_examples 'common-packages'
|
||||
include_examples 'cache-directory'
|
||||
include_examples 'image-lib-cache-directory'
|
||||
include_examples 'glance-directory'
|
||||
|
||||
it do
|
||||
expect(chef_run).to create_directory('/var/cache/glance/api').with(
|
||||
user: 'glance',
|
||||
group: 'glance',
|
||||
mode: 00700
|
||||
)
|
||||
end
|
||||
|
||||
it 'does not upgrade swift package by default' do
|
||||
expect(chef_run).not_to upgrade_package('python-swift')
|
||||
end
|
||||
|
|
|
@ -19,9 +19,16 @@ describe 'openstack-image::registry' do
|
|||
include_context 'image-stubs'
|
||||
include_examples 'common-logging-recipe'
|
||||
include_examples 'common-packages'
|
||||
include_examples 'cache-directory'
|
||||
include_examples 'glance-directory'
|
||||
|
||||
it do
|
||||
expect(chef_run).to create_directory('/var/cache/glance/registry').with(
|
||||
user: 'glance',
|
||||
group: 'glance',
|
||||
mode: 00700
|
||||
)
|
||||
end
|
||||
|
||||
it 'converges when configured to use sqlite' do
|
||||
node.set['openstack']['db']['image']['service_type'] = 'sqlite'
|
||||
|
||||
|
|
|
@ -111,20 +111,6 @@ shared_examples 'common-packages' do
|
|||
end
|
||||
end
|
||||
|
||||
shared_examples 'cache-directory' do
|
||||
describe '/var/cache/glance' do
|
||||
let(:dir) { chef_run.directory('/var/cache/glance') }
|
||||
|
||||
it 'creates directory /var/cache/glance' do
|
||||
expect(chef_run).to create_directory(dir.name).with(
|
||||
user: 'glance',
|
||||
group: 'glance',
|
||||
mode: 00700
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples 'image-lib-cache-directory' do
|
||||
describe '/var/lib/glance/image-cache/' do
|
||||
let(:dir) { chef_run.directory('/var/lib/glance/image-cache/') }
|
||||
|
|
Loading…
Reference in New Issue