From df0b17b6a1148b1cfd068c1ef060f9cb37394300 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 4 Apr 2022 08:24:29 +0900 Subject: [PATCH] Do not start/restart neutron-destroy-patch-ports.service The neutron-destroy-patch-ports service removes patch ports between ovs bridges. Because starting this service causes network disruption, it should not be started/restarted in a running system. Change-Id: I8b60153a2b2d59f1366985ced14a4319b5917970 --- manifests/agents/ml2/ovs.pp | 11 +++++++---- spec/classes/neutron_agents_ml2_ovs_spec.rb | 9 +++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index c661eb9f3..d58baa07e 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -549,11 +549,14 @@ class neutron::agents::ml2::ovs ( } 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': - ensure => $service_ensure, - name => $::neutron::params::destroy_patch_ports_service, - enable => $enabled, - tag => ['neutron-service'], + name => $::neutron::params::destroy_patch_ports_service, + enable => $enabled, + require => Anchor['neutron::service::begin'], + before => Anchor['neutron::service::end'] } } diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb index 2cd9e7576..18af4df39 100644 --- a/spec/classes/neutron_agents_ml2_ovs_spec.rb +++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb @@ -412,10 +412,11 @@ describe 'neutron::agents::ml2::ovs' do it 'configures neutron destroy patch ports service' do should contain_service('neutron-destroy-patch-ports-service').with( - :name => platform_params[:destroy_patch_ports_service], - :enable => true, - :ensure => 'running', - :tag => ['neutron-service'], + :name => platform_params[:destroy_patch_ports_service], + :enable => true, + :ensure => nil, + :require => 'Anchor[neutron::service::begin]', + :before => 'Anchor[neutron::service::end]', ) end