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

@@ -155,10 +155,9 @@ class nova::compute::libvirt (
 
   if($::osfamily == 'RedHat' and $::operatingsystem != 'Fedora') {
     service { 'messagebus':
-      ensure   => running,
-      enable   => true,
-      name     => $::nova::params::messagebus_service_name,
-      provider => $::nova::params::special_service_provider,
+      ensure => running,
+      enable => true,
+      name   => $::nova::params::messagebus_service_name,
     }
     Package['libvirt'] -> Service['messagebus'] -> Service['libvirt']
   }
@@ -197,30 +196,27 @@ class nova::compute::libvirt (
   }
 
   service { 'libvirt' :
-    ensure   => running,
-    enable   => true,
-    name     => $libvirt_service_name,
-    provider => $::nova::params::special_service_provider,
-    require  => Package['libvirt'],
+    ensure  => running,
+    enable  => true,
+    name    => $libvirt_service_name,
+    require => Package['libvirt'],
   }
 
   if $virtlock_service_name {
     service { 'virtlockd':
-      ensure   => running,
-      enable   => true,
-      name     => $virtlock_service_name,
-      provider => $::nova::params::special_service_provider,
-      require  => Package['libvirt']
+      ensure  => running,
+      enable  => true,
+      name    => $virtlock_service_name,
+      require => Package['libvirt']
     }
   }
 
   if $virtlog_service_name {
     service { 'virtlogd':
-      ensure   => running,
-      enable   => true,
-      name     => $virtlog_service_name,
-      provider => $::nova::params::special_service_provider,
-      require  => Package['libvirt']
+      ensure  => running,
+      enable  => true,
+      name    => $virtlog_service_name,
+      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

@@ -30,10 +30,9 @@ describe 'nova::compute::libvirt' do
 
       it {
         is_expected.to contain_service('libvirt').with(
-          :name     => 'libvirt-bin',
-          :enable   => true,
-          :ensure   => 'running',
-          :provider => 'upstart',
+          :name   => 'libvirt-bin',
+          :enable => true,
+          :ensure => 'running',
         )
       }
 
@@ -196,18 +195,16 @@ describe 'nova::compute::libvirt' do
       ) }
 
       it { is_expected.to contain_service('libvirt').with(
-        :name     => 'libvirtd',
-        :enable   => true,
-        :ensure   => 'running',
-        :provider => 'init',
-        :before   => ['Service[nova-compute]'],
+        :name   => 'libvirtd',
+        :enable => true,
+        :ensure => 'running',
+        :before => ['Service[nova-compute]'],
       )}
       it { is_expected.to contain_service('messagebus').with(
-        :ensure   => 'running',
-        :enable   => true,
-        :before   => ['Service[libvirt]'],
-        :provider => 'init',
-        :name     => 'messagebus'
+        :ensure => 'running',
+        :enable => true,
+        :before => ['Service[libvirt]'],
+        :name   => 'messagebus'
       ) }
 
       describe 'on rhel 7' do
@@ -218,13 +215,10 @@ 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'
+          :name => 'dbus'
         )}
       end
 
@@ -325,11 +319,10 @@ describe 'nova::compute::libvirt' do
       ) }
 
       it { is_expected.to contain_service('libvirt').with(
-        :name     => 'libvirtd',
-        :enable   => true,
-        :ensure   => 'running',
-        :provider => nil,
-        :before   => ['Service[nova-compute]']
+        :name   => 'libvirtd',
+        :enable => true,
+        :ensure => 'running',
+        :before => ['Service[nova-compute]']
       )}
 
       it { is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('libvirt.LibvirtDriver')}