Remove unused octavia-db-sync-service tag
This tag is not used by any logic and can be removed. Change-Id: Icb765fcbb141c2ca74bbd0c4077879fbf54c935e
This commit is contained in:
parent
30c6ddbdfa
commit
0ea80a35f8
|
@ -185,17 +185,17 @@ Use the enabled_provider_drivers parameter instead.')
|
||||||
enable => $enabled,
|
enable => $enabled,
|
||||||
hasstatus => true,
|
hasstatus => true,
|
||||||
hasrestart => true,
|
hasrestart => true,
|
||||||
tag => ['octavia-service', 'octavia-db-sync-service'],
|
tag => 'octavia-service',
|
||||||
}
|
}
|
||||||
} elsif $service_name == 'httpd' {
|
} elsif $service_name == 'httpd' {
|
||||||
service { 'octavia-api':
|
service { 'octavia-api':
|
||||||
ensure => 'stopped',
|
ensure => 'stopped',
|
||||||
name => $::octavia::params::api_service_name,
|
name => $::octavia::params::api_service_name,
|
||||||
enable => false,
|
enable => false,
|
||||||
tag => ['octavia-service', 'octavia-db-sync-service'],
|
tag => 'octavia-service',
|
||||||
}
|
}
|
||||||
Service['octavia-api'] -> Service[$service_name]
|
Service['octavia-api'] -> Service[$service_name]
|
||||||
Service<| title == 'httpd' |> { tag +> ['octavia-service', 'octavia-db-sync-service'] }
|
Service<| title == 'httpd' |> { tag +> 'octavia-service' }
|
||||||
} else {
|
} else {
|
||||||
fail("Invalid service_name. Either octavia-api/openstack-octavia-api for \
|
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")
|
running as a standalone service, or httpd for being run by a httpd server")
|
||||||
|
|
|
@ -107,7 +107,7 @@ describe 'octavia::api' do
|
||||||
:enable => params[:enabled],
|
:enable => params[:enabled],
|
||||||
:hasstatus => true,
|
:hasstatus => true,
|
||||||
:hasrestart => true,
|
:hasrestart => true,
|
||||||
:tag => ['octavia-service', 'octavia-db-sync-service'],
|
:tag => 'octavia-service',
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
it { is_expected.to contain_service('octavia-api').that_subscribes_to('Anchor[octavia::service::begin]')}
|
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',
|
:ensure => 'stopped',
|
||||||
:name => platform_params[:api_service_name],
|
:name => platform_params[:api_service_name],
|
||||||
:enable => false,
|
:enable => false,
|
||||||
:tag => ['octavia-service', 'octavia-db-sync-service'],
|
:tag => 'octavia-service',
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue