openstack
/
puppet-octavia
Code Issues Proposed changes

Merge "Remove unused octavia-db-sync-service tag"

This commit is contained in:
Zuul 2023-11-20 18:27:41 +00:00 committed by Gerrit Code Review
parent 7b94bf8969 0ea80a35f8
commit 869993e13a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@ -185,17 +185,17 @@ Use the enabled_provider_drivers parameter instead.')
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['octavia-service', 'octavia-db-sync-service'],
tag => 'octavia-service',
}
} elsif $service_name == 'httpd' {
service { 'octavia-api':
ensure => 'stopped',
name => $::octavia::params::api_service_name,
enable => false,
tag => ['octavia-service', 'octavia-db-sync-service'],
tag => 'octavia-service',
}
Service['octavia-api'] -> Service[$service_name]
Service<| title == 'httpd' |> { tag +> ['octavia-service', 'octavia-db-sync-service'] }
Service<| title == 'httpd' |> { tag +> 'octavia-service' }
} else {
fail("Invalid service_name. Either octavia-api/openstack-octavia-api for \
running as a standalone service, or httpd for being run by a httpd server")

4
spec/classes/octavia_api_spec.rb
View File

@ -107,7 +107,7 @@ describe 'octavia::api' do
:enable => params[:enabled],
:hasstatus => true,
:hasrestart => true,
:tag => ['octavia-service', 'octavia-db-sync-service'],
:tag => 'octavia-service',
)
end
it { is_expected.to contain_service('octavia-api').that_subscribes_to('Anchor[octavia::service::begin]')}
@ -257,7 +257,7 @@ describe 'octavia::api' do
:ensure => 'stopped',
:name => platform_params[:api_service_name],
:enable => false,
:tag => ['octavia-service', 'octavia-db-sync-service'],
:tag => 'octavia-service',
)}
end
end