Do not define service resource when service management is disabled

Change-Id: Ibbdab404674b195b3758b71db1edce8db3a2c660

manifests/agents/dhcp.pp

@@ -223,8 +223,6 @@ class neutron::agents::dhcp (
     } else {
       $service_ensure = 'stopped'
     }
-  }
-
     service { 'neutron-dhcp-service':
       ensure => $service_ensure,
       name   => $::neutron::params::dhcp_agent_service,
@@ -232,3 +230,4 @@ class neutron::agents::dhcp (
       tag    => 'neutron-service',
     }
   }
+}

manifests/agents/metadata.pp

@@ -141,8 +141,6 @@ class neutron::agents::metadata (
     } else {
       $service_ensure = 'stopped'
     }
-  }
-
     service { 'neutron-metadata':
       ensure => $service_ensure,
       name   => $::neutron::params::metadata_agent_service,
@@ -150,3 +148,4 @@ class neutron::agents::metadata (
       tag    => 'neutron-service',
     }
   }
+}

manifests/agents/metering.pp

@@ -104,8 +104,6 @@ class neutron::agents::metering (
     } else {
       $service_ensure = 'stopped'
     }
-  }
-
     service { 'neutron-metering-service':
       ensure => $service_ensure,
       name   => $::neutron::params::metering_agent_service,
@@ -113,3 +111,4 @@ class neutron::agents::metering (
       tag    => 'neutron-service',
     }
   }
+}

manifests/agents/ml2/linuxbridge.pp

@@ -176,21 +176,11 @@ class neutron::agents::ml2::linuxbridge (
     } else {
       $service_ensure = 'stopped'
     }
-  }
-
-  if $::neutron::default_transport_url  {
-    $linuxbridge_agent_subscribe = [
-      Neutron_config['DEFAULT/transport_url']
-    ]
-  } else {
-    $linuxbridge_agent_subscribe = undef
-  }
-
     service { 'neutron-plugin-linuxbridge-agent':
       ensure => $service_ensure,
       name   => $::neutron::params::linuxbridge_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
-    subscribe => $linuxbridge_agent_subscribe,
+    }
   }
 }

manifests/agents/ml2/mlnx.pp

@@ -120,7 +120,6 @@ class neutron::agents::ml2::mlnx (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
     service { $mlnx_agent_service:
       ensure => $service_ensure,
@@ -135,5 +134,5 @@ class neutron::agents::ml2::mlnx (
       enable => $enabled,
       tag    => 'neutron-service',
     }
-
+  }
 }

manifests/agents/ml2/ovs.pp

@@ -540,7 +540,6 @@ class neutron::agents::ml2::ovs (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
     service { 'neutron-ovs-agent-service':
       ensure => $service_ensure,
@@ -568,3 +567,4 @@ class neutron::agents::ml2::ovs (
       }
     }
   }
+}

manifests/agents/ml2/sriov.pp

@@ -150,14 +150,13 @@ class neutron::agents::ml2::sriov (
     } else {
       $service_ensure = 'stopped'
     }
-  }
-
     service { 'neutron-sriov-nic-agent-service':
       ensure => $service_ensure,
       name   => $::neutron::params::sriov_nic_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
+  }
 
   if ($resource_provider_bandwidths != []) {
     $resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',')

manifests/agents/ml2/vpp.pp

@@ -86,8 +86,6 @@ class neutron::agents::ml2::vpp (
     } else {
       $service_ensure = 'stopped'
     }
-  }
-
     service { 'neutron-vpp-agent-service':
       ensure => $service_ensure,
       name   => $::neutron::params::vpp_agent_service,
@@ -95,3 +93,4 @@ class neutron::agents::ml2::vpp (
       tag    => ['neutron-service'],
     }
   }
+}

manifests/agents/ovn_metadata.pp

@@ -195,14 +195,14 @@ class neutron::agents::ovn_metadata (
     } else {
       $service_ensure = 'stopped'
     }
-  }
-
     service { 'ovn-metadata':
       ensure => $service_ensure,
       name   => $::neutron::params::ovn_metadata_agent_service,
       enable => $enabled,
       tag    => 'neutron-service',
     }
+    Exec['Set OVS Manager'] -> Service['ovn-metadata']
+  }
 
   # Set OVS manager so that metadata agent can connect to Open vSwitch
   exec { 'Set OVS Manager':
@@ -210,7 +210,6 @@ class neutron::agents::ovn_metadata (
                -- add Open_vSwitch . manager_options @manager",
     unless  => "ovs-vsctl show | grep \"${ovs_manager}\"",
     path    => '/usr/sbin:/usr/bin:/sbin:/bin',
-    notify  => Service['ovn-metadata'],
   }
 
   Package<| title == 'ovn-metadata' |> -> Exec['Set OVS Manager']

manifests/server.pp

@@ -394,7 +394,6 @@ class neutron::server (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
     # $service_name is the old 'neutron-server' service. If it is in use,
     # then we don't need to start neutron-api and neutron-rpc-server. If
@@ -490,3 +489,4 @@ class neutron::server (
       }
     }
   }
+}

spec/classes/neutron_agents_bagpipe_spec.rb

@@ -25,7 +25,6 @@ describe 'neutron::agents::bagpipe' do
       :dataplane_driver_ipvpn => 'ovs',
       :enabled                => true,
       :enable_rtc             => true,
-      :manage_service         => true,
       :mpls_interface         => '*gre*',
       :ovs_bridge             => 'br-mpls',
       :package_ensure         => 'present',
@@ -87,6 +86,17 @@ describe 'neutron::agents::bagpipe' do
         ).with_value(p[:peers].join(','))
       end
     end
+
+    context 'with manage_service as false' do
+      before :each do
+        params.merge!(:manage_service => false)
+      end
+
+      it 'should not manage the service' do
+        should_not contain_service('bagpipe-bgp')
+      end
+    end
+
   end
 
   on_supported_os({

spec/classes/neutron_agents_bgp_dragent_spec.rb

@@ -21,7 +21,6 @@ describe 'neutron::agents::bgp_dragent' do
     {
       :package_ensure     => 'installed',
       :enabled            => true,
-      :manage_service     => true,
       :bgp_speaker_driver => 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver',
       :purge_config       => false,
     }
@@ -94,6 +93,15 @@ describe 'neutron::agents::bgp_dragent' do
         :tag    => 'neutron-service',
       )}
     end
+
+    context 'with manage_service as false' do
+      before :each do
+        params.merge!(:manage_service => false)
+      end
+      it 'should not manage the service' do
+        should_not contain_service('neutron-bgp-dragent')
+      end
+    end
   end
 
   shared_examples 'neutron::agents::bgp_dragent on Debian' do
@@ -143,6 +151,15 @@ describe 'neutron::agents::bgp_dragent' do
         :tag    => 'neutron-service',
       )}
     end
+
+    context 'with manage_service as false' do
+      before :each do
+        params.merge!(:manage_service => false)
+      end
+      it 'should not manage the service' do
+        should_not contain_service('neutron-bgp-dragent')
+      end
+    end
   end
 
   shared_examples 'neutron::agents::bgp_dragent on Ubuntu' do
@@ -192,6 +209,15 @@ describe 'neutron::agents::bgp_dragent' do
         :tag    => 'neutron-service',
       )}
     end
+
+    context 'with manage_service as false' do
+      before :each do
+        params.merge!(:manage_service => false)
+      end
+      it 'should not manage the service' do
+        should_not contain_service('neutron-bgp-dragent')
+      end
+    end
   end
 
   on_supported_os({

spec/classes/neutron_agents_dhcp_spec.rb

@@ -91,8 +91,8 @@ describe 'neutron::agents::dhcp' do
       before :each do
         params.merge!(:manage_service => false)
       end
-      it 'should not start/stop service' do
+      it 'should not manage the service' do
-        should contain_service('neutron-dhcp-service').without_ensure
+        should_not contain_service('neutron-dhcp-service')
       end
     end
 

spec/classes/neutron_agents_l2gw_spec.rb

@@ -21,7 +21,6 @@ describe 'neutron::agents::l2gw' do
     { :package_ensure                   => 'present',
       :purge_config                     => false,
       :enabled                          => true,
-      :manage_service                   => true,
       :enable_manager                   => false,
       :manager_table_listening_port     => '6632',
       :socket_timeout                   => '30',
@@ -67,6 +66,15 @@ describe 'neutron::agents::l2gw' do
       should contain_service('neutron-l2gw-agent').with_ensure('running')
     end
 
+    context 'with manage_service as false' do
+      before :each do
+        params.merge!(:manage_service => false)
+      end
+      it 'should not manage the service' do
+        should_not contain_service('neutron-l2gw-agent')
+      end
+    end
+
     context 'with multiple ovsdb_hosts' do
       before :each do
         params.merge!(

spec/classes/neutron_agents_l3_spec.rb

@@ -88,6 +88,15 @@ describe 'neutron::agents::l3' do
       end
     end
 
+    context 'with manage_service as false' do
+      before :each do
+        params.merge!(:manage_service => false)
+      end
+      it 'should not manage the service' do
+        should_not contain_service('neutron-l3')
+      end
+    end
+
     context 'with DVR' do
       before :each do
         params.merge!(:agent_mode => 'dvr')

spec/classes/neutron_agents_metadata_spec.rb

@@ -34,8 +34,8 @@ describe 'neutron::agents::metadata' do
         params.merge!(:manage_service => false)
       end
 
-      it 'should not start/stop service' do
+      it 'should not manage the service' do
-        should contain_service('neutron-metadata').without_ensure
+        should_not contain_service('neutron-metadata')
       end
     end
 

spec/classes/neutron_agents_metering_spec.rb

@@ -91,8 +91,8 @@ describe 'neutron::agents::metering' do
         params.merge!(:manage_service => false)
       end
 
-      it 'should not start/stop service' do
+      it 'should not manage the service' do
-        should contain_service('neutron-metering-service').without_ensure
+        should_not contain_service('neutron-metering-service')
       end
     end
 

spec/classes/neutron_agents_ml2_linuxbridge_spec.rb

@@ -9,7 +9,6 @@ describe 'neutron::agents::ml2::linuxbridge' do
     {
       :package_ensure              => 'present',
       :enabled                     => true,
-      :manage_service              => true,
       :tunnel_types                => [],
       :local_ip                    => false,
       :physical_interface_mappings => [],
@@ -70,8 +69,8 @@ describe 'neutron::agents::ml2::linuxbridge' do
         before :each do
           params.merge!(:manage_service => false)
         end
-        it 'should not start/stop service' do
+        it 'should not manage the service' do
-          should contain_service('neutron-plugin-linuxbridge-agent').without_ensure
+          should_not contain_service('neutron-plugin-linuxbridge-agent')
         end
       end
 

spec/classes/neutron_agents_ml2_mlnx_spec.rb

@@ -9,7 +9,6 @@ describe 'neutron::agents::ml2::mlnx' do
     {
       :package_ensure => 'present',
       :enabled        => true,
-      :manage_service            => true
     }
   end
 
@@ -57,9 +56,9 @@ describe 'neutron::agents::ml2::mlnx' do
       before :each do
         params.merge!(:manage_service => false)
       end
-      it 'should not start/stop service' do
+      it 'should not manage the  services' do
-        should contain_service(platform_params[:mlnx_agent_service]).without_ensure
+        should_not contain_service(platform_params[:mlnx_agent_service])
-        should contain_service('eswitchd').without_ensure
+        should_not contain_service('eswitchd')
       end
     end
 

spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb

@@ -104,6 +104,17 @@ describe 'neutron::agents::ml2::networking_baremetal' do
         should contain_ironic_neutron_agent_config('ironic/system_scope').with_value('all')
       end
     end
+
+    context 'with manage_service as false' do
+      before :each do
+        params.merge!(:manage_service => false)
+      end
+
+      it 'should not manage the service' do
+        should_not contain_service('ironic-neutron-agent-service')
+      end
+    end
+
   end
 
   on_supported_os({

spec/classes/neutron_agents_ml2_ovs_spec.rb

@@ -114,8 +114,8 @@ describe 'neutron::agents::ml2::ovs' do
       before :each do
         params.merge!(:manage_service => false)
       end
-      it 'should not start/stop service' do
+      it 'should not manage the service' do
-        should contain_service('neutron-ovs-agent-service').without_ensure
+        should_not contain_service('neutron-ovs-agent-service')
       end
     end
 

spec/classes/neutron_agents_ml2_sriov_spec.rb

@@ -9,7 +9,6 @@ describe 'neutron::agents::ml2::sriov' do
     {
       :package_ensure            => 'present',
       :enabled                   => true,
-      :manage_service            => true,
       :polling_interval          => 2,
       :supported_pci_vendor_devs => [],
       :purge_config              => false,
@@ -104,8 +103,8 @@ describe 'neutron::agents::ml2::sriov' do
       before :each do
         params.merge!(:manage_service => false)
       end
-      it 'should not start/stop service' do
+      it 'should not manage the service' do
-        should contain_service('neutron-sriov-nic-agent-service').without_ensure
+        should_not contain_service('neutron-sriov-nic-agent-service')
       end
     end
 

spec/classes/neutron_agents_ml2_vpp_spec.rb

@@ -8,7 +8,6 @@ describe 'neutron::agents::ml2::vpp' do
   let :default_params do
     { :package_ensure => 'present',
       :enabled        => true,
-      :manage_service => true,
       :etcd_host      => '127.0.0.1',
       :etcd_port      => 4001,
       }
@@ -60,8 +59,8 @@ describe 'neutron::agents::ml2::vpp' do
       before :each do
         params.merge!(:manage_service => false)
       end
-      it 'should not start/stop service' do
+      it 'should not manage the service' do
-        should contain_service('neutron-vpp-agent-service').without_ensure
+        should_not contain_service('neutron-vpp-agent-service')
       end
     end
 

spec/classes/neutron_agents_ovn_metadata_spec.rb

@@ -37,8 +37,8 @@ describe 'neutron::agents::ovn_metadata' do
         params.merge!(:manage_service => false)
       end
 
-      it 'should not start/stop service' do
+      it 'should not manage the service' do
-        should contain_service('ovn-metadata').without_ensure
+        should_not contain_service('ovn-metadata')
       end
     end
 

spec/classes/neutron_server_spec.rb

@@ -99,12 +99,12 @@ describe 'neutron::server' do
         params.merge!(:manage_service => false)
       end
 
-      it 'should not start/stop service' do
+      it 'should not manage the service' do
         if platform_params.has_key?(:server_service)
-          should contain_service('neutron-server').without_ensure
+          should_not contain_service('neutron-server')
         else
-          should contain_service('neutron-api').without_ensure
+          should_not contain_service('neutron-api')
-          should contain_service('neutron-rpc-server').without_ensure
+          should_not contain_service('neutron-rpc-server')
         end
       end
     end