openstack/puppet-neutron
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2023-07-27 08:36:03 +00:00 committed by Gerrit Code Review
commit fde89c4e46
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agents/ml2/ovs.pp
View File

@ -548,7 +548,7 @@ class neutron::agents::ml2::ovs (
ensure => $service_ensure,
name => $::neutron::params::ovs_agent_service,
enable => $enabled,
tag => ['neutron-service', 'neutron-db-sync-service'],
tag => ['neutron-service'],
}
if ($facts['os']['family'] == 'Redhat') {

8
manifests/server.pp
View File

@ -387,7 +387,7 @@ class neutron::server (
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
tag => ['neutron-service', 'neutron-server-eventlet'],
}
} elsif $service_name == 'httpd' {
fail('Use api_service_name and rpc_service_name to run api service by httpd')
@ -400,7 +400,7 @@ class neutron::server (
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service'],
tag => ['neutron-service'],
}
}
} else {
@ -445,7 +445,7 @@ class neutron::server (
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
tag => ['neutron-service', 'neutron-server-eventlet'],
}
if $::neutron::params::server_service {
@ -461,7 +461,7 @@ class neutron::server (
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service'],
tag => ['neutron-service'],
}
if $::neutron::params::server_service {

2
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -103,7 +103,7 @@ describe 'neutron::agents::ml2::ovs' do
:name => platform_params[:ovs_agent_service],
:enable => true,
:ensure => 'running',
:tag => ['neutron-service', 'neutron-db-sync-service'],
:tag => ['neutron-service'],
)
should contain_service('neutron-ovs-agent-service').that_subscribes_to('Anchor[neutron::service::begin]')
should contain_service('neutron-ovs-agent-service').that_notifies('Anchor[neutron::service::end]')

10
spec/classes/neutron_server_spec.rb
View File

@ -52,7 +52,7 @@ describe 'neutron::server' do
:name => platform_params[:server_service],
:enable => true,
:ensure => 'running',
:tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
:tag => ['neutron-service', 'neutron-server-eventlet'],
)
should contain_service('neutron-server').that_subscribes_to('Anchor[neutron::service::begin]')
should contain_service('neutron-server').that_notifies('Anchor[neutron::service::end]')
@ -61,7 +61,7 @@ describe 'neutron::server' do
:name => platform_params[:api_service_name],
:enable => true,
:ensure => 'running',
:tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
:tag => ['neutron-service', 'neutron-server-eventlet'],
)
should contain_service('neutron-api').that_subscribes_to('Anchor[neutron::service::begin]')
should contain_service('neutron-api').that_notifies('Anchor[neutron::service::end]')
@ -70,7 +70,7 @@ describe 'neutron::server' do
:name => platform_params[:rpc_service_name],
:enable => true,
:ensure => 'running',
:tag => ['neutron-service', 'neutron-db-sync-service'],
:tag => ['neutron-service'],
)
should contain_service('neutron-rpc-server').that_subscribes_to('Anchor[neutron::service::begin]')
should contain_service('neutron-rpc-server').that_notifies('Anchor[neutron::service::end]')
@ -301,7 +301,7 @@ describe 'neutron::server' do
:ensure => 'running',
:name => 'neutron-rpc-server',
:enable => true,
:tag => ['neutron-service', 'neutron-db-sync-service'],
:tag => ['neutron-service'],
)
end
end
@ -316,7 +316,7 @@ describe 'neutron::server' do
:name => 'foobar',
:enable => true,
:ensure => 'running',
:tag => ['neutron-service', 'neutron-db-sync-service'],
:tag => ['neutron-service'],
)
end
end