Stop overriding service provider

Stop overriding service providers and let Puppet finds the best,
depending of the distro where Puppet is run.

Change-Id: Ic06ffc377f8982337d977bebb96ef7f6196e5c22

manifests/compute/libvirt.pp

@@ -158,7 +158,6 @@ class nova::compute::libvirt (
       ensure => running,
       enable => true,
       name   => $::nova::params::messagebus_service_name,
-      provider => $::nova::params::special_service_provider,
     }
     Package['libvirt'] -> Service['messagebus'] -> Service['libvirt']
   }
@@ -200,7 +199,6 @@ class nova::compute::libvirt (
     ensure  => running,
     enable  => true,
     name    => $libvirt_service_name,
-    provider => $::nova::params::special_service_provider,
     require => Package['libvirt'],
   }
 
@@ -209,7 +207,6 @@ class nova::compute::libvirt (
       ensure  => running,
       enable  => true,
       name    => $virtlock_service_name,
-      provider => $::nova::params::special_service_provider,
       require => Package['libvirt']
     }
   }
@@ -219,7 +216,6 @@ class nova::compute::libvirt (
       ensure  => running,
       enable  => true,
       name    => $virtlog_service_name,
-      provider => $::nova::params::special_service_provider,
       require => Package['libvirt']
     }
   }

manifests/params.pp

@@ -52,20 +52,16 @@ class nova::params {
       $nova_wsgi_script_path         = '/var/www/cgi-bin/nova'
       $nova_api_wsgi_script_source   = '/usr/lib/python2.7/site-packages/nova/wsgi/nova-api.py'
       case $::operatingsystem {
-        'Fedora': {
-          $special_service_provider = undef
-        }
         'RedHat', 'CentOS', 'Scientific', 'OracleLinux': {
           if (versioncmp($::operatingsystemmajrelease, '7') < 0) {
             $messagebus_service_name = 'messagebus'
-            $special_service_provider = 'init'
           } else {
             $messagebus_service_name = 'dbus'
-            $special_service_provider = 'redhat'
           }
         }
         default: {
-          $special_service_provider = 'init'
+          # not packaged on Fedora
+          $messagebus_service_name = undef
         }
       }
     }
@@ -112,8 +108,6 @@ class nova::params {
           $spicehtml5proxy_package_name = 'nova-consoleproxy'
           $spicehtml5proxy_service_name = 'nova-spicehtml5proxy'
           $vncproxy_package_name    = 'nova-consoleproxy'
-          # Use default provider on Debian
-          $special_service_provider = undef
           $libvirt_service_name         = 'libvirtd'
           $virtlock_service_name        = undef
           $virtlog_service_name         = undef
@@ -122,8 +116,6 @@ class nova::params {
           $spicehtml5proxy_package_name = 'nova-spiceproxy'
           $spicehtml5proxy_service_name = 'nova-spiceproxy'
           $vncproxy_package_name    = 'nova-novncproxy'
-          # some of the services need to be started form the special upstart provider
-          $special_service_provider = 'upstart'
           $libvirt_service_name         = 'libvirt-bin'
           $virtlock_service_name        = 'virtlockd'
           $virtlog_service_name         = 'virtlogd'

releasenotes/notes/stop_service_provider-557dea3058c3bcec.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - Stop overriding service providers, and let Puppet finds which one is the best.

spec/classes/nova_compute_libvirt_spec.rb

@@ -33,7 +33,6 @@ describe 'nova::compute::libvirt' do
           :name   => 'libvirt-bin',
           :enable => true,
           :ensure => 'running',
-          :provider => 'upstart',
         )
       }
 
@@ -199,14 +198,12 @@ describe 'nova::compute::libvirt' do
         :name   => 'libvirtd',
         :enable => true,
         :ensure => 'running',
-        :provider => 'init',
         :before => ['Service[nova-compute]'],
       )}
       it { is_expected.to contain_service('messagebus').with(
         :ensure => 'running',
         :enable => true,
         :before => ['Service[libvirt]'],
-        :provider => 'init',
         :name   => 'messagebus'
       ) }
 
@@ -218,12 +215,9 @@ describe 'nova::compute::libvirt' do
           })
         end
 
-        it { is_expected.to contain_service('libvirt').with(
-          :provider => 'redhat'
-        )}
+        it { is_expected.to contain_service('libvirt')}
 
         it { is_expected.to contain_service('messagebus').with(
-          :provider => 'redhat',
           :name => 'dbus'
         )}
       end
@@ -328,7 +322,6 @@ describe 'nova::compute::libvirt' do
         :name   => 'libvirtd',
         :enable => true,
         :ensure => 'running',
-        :provider => nil,
         :before => ['Service[nova-compute]']
       )}