Merge "Add manage_service parameter to all agents::ml2 classes that did not yet have it."

manifests/agents/ml2/linuxbridge.pp

@@ -12,6 +12,10 @@
 #   (required) Whether or not to enable the agent.
 #   Defaults to true.
 #
+# [*manage_service*]
+#   (optional) Whether to start/stop the service
+#   Defaults to true
+#
 # [*tunnel_types*]
 #   (optional) List of types of tunnels to use when utilizing tunnels.
 #   Supported tunnel types are: vxlan.
@@ -57,6 +61,7 @@
 class neutron::agents::ml2::linuxbridge (
   $package_ensure   = 'present',
   $enabled          = true,
+  $manage_service   = true,
   $tunnel_types     = [],
   $local_ip         = false,
   $vxlan_group      = '224.0.0.1',
@@ -143,10 +148,12 @@ class neutron::agents::ml2::linuxbridge (
     }
   }
 
-  if $enabled {
-    $service_ensure = 'running'
-  } else {
-    $service_ensure = 'stopped'
+  if $manage_service {
+    if $enabled {
+      $service_ensure = 'running'
+    } else {
+      $service_ensure = 'stopped'
+    }
   }
 
   service { 'neutron-plugin-linuxbridge-agent':

manifests/agents/ml2/ovs.pp

@@ -29,6 +29,10 @@
 #   (required) Whether or not to enable the OVS Agent
 #   Defaults to true
 #
+# [*manage_service*]
+#   (optional) Whether to start/stop the service
+#   Defaults to true
+#
 # [*bridge_uplinks*]
 #   (optional) List of interfaces to connect to the bridge when doing
 #   bridge mapping.
@@ -91,6 +95,7 @@
 class neutron::agents::ml2::ovs (
   $package_ensure             = 'present',
   $enabled                    = true,
+  $manage_service             = true,
   $bridge_uplinks             = [],
   $bridge_mappings            = [],
   $integration_bridge         = 'br-int',
@@ -216,10 +221,12 @@ class neutron::agents::ml2::ovs (
     }
   }
 
-  if $enabled {
-    $service_ensure = 'running'
-  } else {
-    $service_ensure = 'stopped'
+  if $manage_service {
+    if $enabled {
+      $service_ensure = 'running'
+    } else {
+      $service_ensure = 'stopped'
+    }
   }
 
   service { 'neutron-ovs-agent-service':

manifests/agents/ml2/sriov.pp

@@ -29,6 +29,10 @@
 #   (required) Whether or not to enable the OVS Agent
 #   Defaults to true
 #
+# [*manage_service*]
+#   (optional) Whether to start/stop the service
+#   Defaults to true
+#
 # [*physical_device_mappings*]
 #   (optional) List of <physical_network>:<physical device>
 #   All physical networks listed in network_vlan_ranges
@@ -50,6 +54,7 @@
 class neutron::agents::ml2::sriov (
   $package_ensure             = 'present',
   $enabled                    = true,
+  $manage_service             = true,
   $physical_device_mappings   = [],
   $polling_interval           = 2,
   $exclude_devices            = [],
@@ -73,10 +78,12 @@ class neutron::agents::ml2::sriov (
     tag    => 'openstack',
   }
 
-  if $enabled {
-    $service_ensure = 'running'
-  } else {
-    $service_ensure = 'stopped'
+  if $manage_service {
+    if $enabled {
+      $service_ensure = 'running'
+    } else {
+      $service_ensure = 'stopped'
+    }
   }
 
   service { 'neutron-sriov-nic-agent-service':

spec/classes/neutron_agents_ml2_linuxbridge_spec.rb

@@ -9,6 +9,7 @@ describe 'neutron::agents::ml2::linuxbridge' do
   let :default_params do
     { :package_ensure   => 'present',
       :enabled          => true,
+      :manage_service   => true,
       :tunnel_types     => [],
       :local_ip         => false,
       :vxlan_group      => '224.0.0.1',
@@ -66,6 +67,15 @@ describe 'neutron::agents::ml2::linuxbridge' do
         )
       end
 
+      context 'with manage_service as false' do
+        before :each do
+          params.merge!(:manage_service => false)
+        end
+        it 'should not start/stop service' do
+          is_expected.to contain_service('neutron-plugin-linuxbridge-agent').without_ensure
+        end
+      end
+
       it 'does not configre VXLAN tunneling' do
         is_expected.to contain_neutron_agent_linuxbridge('vxlan/enable_vxlan').with_value(false)
         is_expected.to contain_neutron_agent_linuxbridge('vxlan/local_ip').with_ensure('absent')

spec/classes/neutron_agents_ml2_ovs_spec.rb

@@ -80,6 +80,15 @@ describe 'neutron::agents::ml2::ovs' do
       )
     end
 
+    context 'with manage_service as false' do
+      before :each do
+        params.merge!(:manage_service => false)
+      end
+      it 'should not start/stop service' do
+        is_expected.to contain_service('neutron-ovs-agent-service').without_ensure
+      end
+    end
+
     context 'when supplying a firewall driver' do
       before :each do
         params.merge!(:firewall_driver => false)

spec/classes/neutron_agents_ml2_sriov_spec.rb

@@ -9,6 +9,7 @@ describe 'neutron::agents::ml2::sriov' do
   let :default_params do
     { :package_ensure             => 'present',
       :enabled                    => true,
+      :manage_service             => true,
       :physical_device_mappings   => [],
       :exclude_devices            => [],
       :polling_interval           => 2,
@@ -47,7 +48,7 @@ describe 'neutron::agents::ml2::sriov' do
       is_expected.to contain_package('neutron-sriov-nic-agent').with_before(/Neutron_plugin_ml2\[.+\]/)
     end
 
-    it 'configures neutron ovs agent service' do
+    it 'configures neutron sriov agent service' do
       is_expected.to contain_service('neutron-sriov-nic-agent-service').with(
         :name    => platform_params[:sriov_nic_agent_service],
         :enable  => true,
@@ -56,6 +57,15 @@ describe 'neutron::agents::ml2::sriov' do
       )
     end
 
+    context 'with manage_service as false' do
+      before :each do
+        params.merge!(:manage_service => false)
+      end
+      it 'should not start/stop service' do
+        is_expected.to contain_service('neutron-sriov-nic-agent-service').without_ensure
+      end
+    end
+
     context 'when supplying device mapping' do
       before :each do
         params.merge!(:physical_device_mappings => ['physnet1:eth1'],