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

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']
       }
     }
 

spec/classes/neutron_agents_ml2_ovs_spec.rb

@@ -427,10 +427,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