Do not run db_sync on SUSE

The startup scripts already run db_sync, there is no need
to run it twice (and this is racing with the start of the
daemon, so it crashes in 50% of the cases)

Change-Id: I87df17aad2fa2a01cc8ba6c0a833abcb251815bc
Closes-Bug: #1411403
This commit is contained in:
Dirk Mueller 2014-11-10 14:00:08 +01:00 committed by Mark Vanderwiel
parent b5d93e70e6
commit 70c60b5f08
3 changed files with 4 additions and 7 deletions

View File

@ -8,6 +8,7 @@ This file is used to list changes made in each version of the cookbook-openstack
* Bump Chef gem to 11.16
* update cinder api url to default of v2
* Run trove-manage as user, not as root
* Skip trove-manage run on SUSE, it is run by the init scripts already
## 9.0.1
* Allow setting passwords via attributes by using the get_password method

View File

@ -99,4 +99,5 @@ execute 'trove-manage db_sync' do
user node['openstack']['database']['user']
group node['openstack']['database']['group']
notifies :restart, 'service[trove-api]', :immediately
not_if { platform_family? 'suse' }
end

View File

@ -95,16 +95,11 @@ describe 'openstack-database::api' do
describe 'database initialization' do
let(:manage_cmd) { 'trove-manage db_sync' }
it 'runs trove-manage' do
expect(chef_run).to run_execute(manage_cmd).with(
it 'runs not trove-manage' do
expect(chef_run).to_not run_execute(manage_cmd).with(
user: 'trove',
group: 'trove'
)
end
it 'restarts the trove-api service' do
res = chef_run.execute(manage_cmd)
expect(res).to notify('service[trove-api]').to(:restart)
end
end
end