From c0d0bcf3d836e8814dd7b6ea70737c575fb9631d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 4 Jun 2020 21:47:07 +0900
Subject: [PATCH] Cleanup compat code for puppet <4.5

... because we no longer support puppet 4.

Change-Id: I80b8ee9c6bcff7e3985f5135123430e4f269849c
---
 manifests/compute/libvirt/services.pp | 30 ++++++++++++---------------
 manifests/params.pp                   |  9 --------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp
index 624e334c3..4d09689df 100644
--- a/manifests/compute/libvirt/services.pp
+++ b/manifests/compute/libvirt/services.pp
@@ -61,20 +61,18 @@ class nova::compute::libvirt::services (
       tag    => ['openstack', 'nova-support-package'],
     }
     service { 'libvirt' :
-      ensure   => running,
-      enable   => true,
-      name     => $libvirt_service_name,
-      provider => $::nova::params::special_service_provider,
-      require  => Anchor['nova::install::end'],
+      ensure  => running,
+      enable  => true,
+      name    => $libvirt_service_name,
+      require => Anchor['nova::install::end'],
     }
 
     # messagebus
     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']
     }
@@ -86,20 +84,18 @@ class nova::compute::libvirt::services (
 
   if $virtlock_service_name {
     service { 'virtlockd':
-      ensure   => running,
-      enable   => true,
-      name     => $virtlock_service_name,
-      provider => $::nova::params::special_service_provider,
+      ensure => running,
+      enable => true,
+      name   => $virtlock_service_name,
     }
     Package<| name == 'libvirt' |> -> Service['virtlockd']
   }
 
   if $virtlog_service_name {
     service { 'virtlogd':
-      ensure   => running,
-      enable   => true,
-      name     => $virtlog_service_name,
-      provider => $::nova::params::special_service_provider,
+      ensure => running,
+      enable => true,
+      name   => $virtlog_service_name,
     }
     Package<| name == 'libvirt' |> -> Service['virtlogd']
   }
diff --git a/manifests/params.pp b/manifests/params.pp
index 3ccdcdb08..ed8c1a4d9 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -55,19 +55,12 @@ class nova::params {
         'RedHat', 'CentOS', 'Scientific', 'OracleLinux': {
           if (versioncmp($::operatingsystemmajrelease, '7') < 0) {
             $messagebus_service_name  = 'messagebus'
-            $special_service_provider = undef
           } else {
-            if (versioncmp($::puppetversion, '4.5') < 0) {
-              $special_service_provider = 'redhat'
-            } else {
-              $special_service_provider = undef
-            }
             $messagebus_service_name = 'dbus'
           }
         }
         default: {
           # not required on Fedora
-          $special_service_provider = undef
           $messagebus_service_name  = undef
         }
       }
@@ -116,7 +109,6 @@ class nova::params {
           $vncproxy_package_name           = 'nova-consoleproxy'
           $serialproxy_package_name        = 'nova-consoleproxy'
           # Use default provider on Debian
-          $special_service_provider        = undef
           $virtlock_service_name           = 'virtlockd'
           $virtlog_service_name            = 'virtlogd'
         }
@@ -127,7 +119,6 @@ class nova::params {
           $vncproxy_package_name           = 'nova-novncproxy'
           $serialproxy_package_name        = 'nova-serialproxy'
           # Use default provider on Debian
-          $special_service_provider        = undef
           $virtlock_service_name           = 'virtlockd'
           $virtlog_service_name            = 'virtlogd'
         }