Merge "Ubuntu: Add ovn-maintenance-worker support"

manifests/params.pp

@@ -14,6 +14,7 @@ class neutron::params {
   $metadata_agent_service         = 'neutron-metadata-agent'
   $ovn_metadata_agent_service     = 'neutron-ovn-metadata-agent'
   $ovn_agent_service              = 'neutron-ovn-agent'
+  $ovn_maintenance_worker_service = 'neutron-ovn-maintenance-worker'
   $bgp_dragent_service            = 'neutron-bgp-dragent'
   $bgpvpn_plugin_package          = 'python3-networking-bgpvpn'
   $l2gw_agent_service             = 'neutron-l2gw-agent'
@@ -53,7 +54,6 @@ class neutron::params {
       $ovn_metadata_agent_package         = 'openstack-neutron-ovn-metadata-agent'
       $ovn_agent_package                  = 'openstack-neutron-ovn-agent'
       $ovn_maintenance_worker_package     = 'openstack-neutron-ovn-maintenance-worker'
-      $ovn_maintenance_worker_service     = 'neutron-ovn-maintenance-worker'
       $dynamic_routing_package            = 'python3-neutron-dynamic-routing'
       $bgp_dragent_package                = 'openstack-neutron-bgp-dragent'
       $bagpipe_bgp_package                = 'openstack-bagpipe-bgp'
@@ -117,8 +117,7 @@ class neutron::params {
       $l2gw_package                       = 'python3-networking-l2gw'
       $ovn_metadata_agent_package         = 'neutron-ovn-metadata-agent'
       $ovn_agent_package                  = 'neutron-ovn-agent'
-      $ovn_maintenance_worker_package     = undef
+      $ovn_maintenance_worker_package     = 'neutron-ovn-maintenance-worker'
-      $ovn_maintenance_worker_service     = undef
       $neutron_wsgi_script_path           = '/usr/lib/cgi-bin/neutron'
       $neutron_wsgi_script_source         = '/usr/bin/neutron-api'
       $networking_baremetal_package       = 'python3-ironic-neutron-agent'

manifests/plugins/ml2/ovn/maintenance_worker.pp

@@ -22,16 +22,13 @@ class neutron::plugins::ml2::ovn::maintenance_worker (
 
   include neutron::params
 
-  if $::neutron::params::ovn_maintenance_worker_package {
   package { 'neutron-ovn-maintenance-worker':
     ensure => $package_ensure,
     name   => $::neutron::params::ovn_maintenance_worker_package,
     tag    => ['openstack', 'neutron-package'],
   }
-  }
 
   if $manage_service {
-    if $::neutron::params::ovn_maintenance_worker_service {
     if $enabled {
       $service_ensure = 'running'
     } else {
@@ -43,8 +40,5 @@ class neutron::plugins::ml2::ovn::maintenance_worker (
       enable => $enabled,
       tag    => 'neutron-service',
     }
-    } else {
-      warning('neutron-ovn-maintenance-worker service is not available.')
-    }
   }
 }

spec/classes/neutron_plugins_ml2_ovn_maintenance_worker_spec.rb

@@ -44,16 +44,15 @@ describe 'neutron::plugins::ml2::ovn::maintenance_worker' do
       let (:platform_params) do
         case facts[:os]['family']
         when 'Debian'
-          {}
+          { :ovn_maintenance_worker_package => 'neutron-ovn-maintenance-worker',
+            :ovn_maintenance_worker_service => 'neutron-ovn-maintenance-worker' }
         when 'RedHat'
           { :ovn_maintenance_worker_package => 'openstack-neutron-ovn-maintenance-worker',
             :ovn_maintenance_worker_service => 'neutron-ovn-maintenance-worker' }
         end
       end
 
-      if facts[:os]['family'] == 'RedHat'
       it_behaves_like 'neutron::plugins::ml2::ovn::maintenance_worker'
     end
   end
-  end
 end