Fix horizon restarts apache2 before setup

The horizon recipe attempts to restart apache2 before that recipe
has had a chance to define the service resource.

Change-Id: Ied27dc2b2d2355092141ddbd57a64f9c0f975f39
Closes-Bug: #1418714
This commit is contained in:
Mark Vanderwiel 2015-02-05 14:53:07 -06:00
parent 9ce8d9d5a7
commit abeea277ea
3 changed files with 6 additions and 1 deletions

View File

@ -23,6 +23,7 @@ This file is used to list changes made in each version of the openstack-dashboar
* Allow webserver to be configurable
* Fix site template directory defaults for apache 2.4
* Use common specific_endpoint routines (bug 1412919)
* Fix notify when using listen_addresses
## 9.1
* python_packages database client attributes have been moved to the -common cookbook

View File

@ -71,7 +71,7 @@ template node['openstack']['dashboard']['local_settings_path'] do
memcached_servers: memcached
)
notifies :restart, "service[#{node['openstack']['dashboard']['server_type']}]", :immediately
notifies :restart, "service[#{node['openstack']['dashboard']['server_type']}]", :delayed
end
execute 'openstack-dashboard syncdb' do

View File

@ -28,6 +28,10 @@ describe 'openstack-dashboard::horizon' do
describe 'local_settings.py' do
let(:file) { chef_run.template('/etc/openstack-dashboard/local_settings.py') }
it 'notifies web service to restart delayed' do
expect(file).to notify('service[apache2]').to(:restart).delayed
end
it 'has proper owner' do
expect(file.owner).to eq('root')
expect(file.group).to eq('horizon')