openstack
/
puppet-magnum
Code Issues Proposed changes

Merge "Remove magnum-db-sync-service tag for service"

This commit is contained in:
Zuul 2021-09-16 14:03:56 +00:00 committed by Gerrit Code Review
parent c7f078ec68 5eb6973080
commit a4e75ffcef
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