openstack/puppet-neutron
Code Issues Proposed changes

Merge "Do not start/restart neutron-destroy-patch-ports.service"

Browse Source
This commit is contained in:
Zuul
2022-04-05 16:45:03 +00:00
committed by Gerrit Code Review
parent 04fbd78df5 df0b17b6a1
commit 38f1a2e250
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,11 +549,14 @@ class neutron::agents::ml2::ovs (
} }
if ($::osfamily == 'Redhat') { if ($::osfamily == 'Redhat') {
# NOTE(tkajinam): The service should not be started in a running system.
# DO NOT define ensure so the service status is not
# changed.
service { 'neutron-destroy-patch-ports-service': service { 'neutron-destroy-patch-ports-service':
ensure => $service_ensure, name => $::neutron::params::destroy_patch_ports_service,
name => $::neutron::params::destroy_patch_ports_service, enable => $enabled,
enable => $enabled, require => Anchor['neutron::service::begin'],
tag => ['neutron-service'], before => Anchor['neutron::service::end']
} }
} }

9
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@@ -427,10 +427,11 @@ describe 'neutron::agents::ml2::ovs' do
it 'configures neutron destroy patch ports service' do it 'configures neutron destroy patch ports service' do
should contain_service('neutron-destroy-patch-ports-service').with( should contain_service('neutron-destroy-patch-ports-service').with(
:name => platform_params[:destroy_patch_ports_service], :name => platform_params[:destroy_patch_ports_service],
:enable => true, :enable => true,
:ensure => 'running', :ensure => nil,
:tag => ['neutron-service'], :require => 'Anchor[neutron::service::begin]',
:before => 'Anchor[neutron::service::end]',
) )
end end