openstack/puppet-magnum
Code Issues Proposed changes

Remove magnum-db-sync-service tag for service

Browse Source 
This causes a race condition that sometimes the
normal API service is started before the httpd
service because deps is not enforced properly.

This tags doesn't do anything and doesn't exist
in deps either.

Change-Id: Ib407dc811bbe6813c96f40343426fc1fb5b503fc
This commit is contained in:
Tobias Urdin 2021-09-13 10:56:47 +02:00 committed by Tobias Urdin
parent bca357635d
commit 5eb6973080
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@ -136,7 +136,7 @@ class magnum::api(
name => $::magnum::params::api_service,
enable => $enabled,
hasstatus => true,
tag => ['magnum-service', 'magnum-db-sync-service'],
tag => 'magnum-service',
}
} elsif $service_name == 'httpd' {
include apache::params
@ -145,10 +145,10 @@ class magnum::api(
name => $::magnum::params::api_service,
enable => false,
hasstatus => true,
tag => ['magnum-service', 'magnum-db-sync-service'],
tag => 'magnum-service',
}
Service['magnum-api'] -> Service[$service_name]
Service<| title == 'httpd' |> { tag +> ['magnum-service', 'magnum-db-sync-service'] }
Service<| title == 'httpd' |> { tag +> 'magnum-service' }
}
}

2
manifests/conductor.pp
View File

@ -62,7 +62,7 @@ class magnum::conductor(
name => $::magnum::params::conductor_package,
enable => $enabled,
hasstatus => true,
tag => ['magnum-service', 'magnum-db-sync-service'],
tag => 'magnum-service',
}
}

4
spec/classes/magnum_api_spec.rb
View File

@ -47,7 +47,7 @@ describe 'magnum::api' do
it 'ensures magnum api service is running' do
is_expected.to contain_service('magnum-api').with(
'hasstatus' => true,
'tag' => ['magnum-service', 'magnum-db-sync-service']
'tag' => 'magnum-service',
)
end
@ -131,7 +131,7 @@ describe 'magnum::api' do
:name => platform_params[:api_service],
:enable => false,
:hasstatus => true,
:tag => ['magnum-service', 'magnum-db-sync-service'],
:tag => 'magnum-service',
)}
end
end