From dc2eb5518e382d04a960cbe254181ed8dc39c9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr@redhat.com>
Date: Wed, 13 May 2015 18:03:00 +0200
Subject: [PATCH] Use correct name on el7+

On el7+ platform the correct name of messagebus service is dbus.
For idempotency of module on those platforms it is required to either
use correct names and not alises or fix service provider.

Change-Id: I824f40478e9190a24f7a7833b6d84311cdec8f25
---
 manifests/compute/libvirt.pp              | 2 +-
 manifests/params.pp                       | 2 ++
 spec/classes/nova_compute_libvirt_spec.rb | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp
index 04852ade1..14a24ec84 100644
--- a/manifests/compute/libvirt.pp
+++ b/manifests/compute/libvirt.pp
@@ -125,10 +125,10 @@ class nova::compute::libvirt (
     service { 'messagebus':
       ensure   => running,
       enable   => true,
+      name     => $::nova::params::messagebus_service_name,
       provider => $::nova::params::special_service_provider,
     }
     Package['libvirt'] -> Service['messagebus'] -> Service['libvirt']
-
   }
 
   if $migration_support {
diff --git a/manifests/params.pp b/manifests/params.pp
index 50f9b014f..5e491f4ef 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -49,8 +49,10 @@ class nova::params {
         }
         '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 = undef
           }
         }
diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb
index 0799145ee..a2795f3d2 100644
--- a/spec/classes/nova_compute_libvirt_spec.rb
+++ b/spec/classes/nova_compute_libvirt_spec.rb
@@ -154,7 +154,8 @@ describe 'nova::compute::libvirt' do
         :ensure   => 'running',
         :enable   => true,
         :before   => 'Service[libvirt]',
-        :provider => 'init'
+        :provider => 'init',
+        :name     => 'messagebus'
       ) }
 
       describe 'on rhel 7' do
@@ -168,7 +169,8 @@ describe 'nova::compute::libvirt' do
         )}
 
         it { is_expected.to contain_service('messagebus').with(
-          :provider => nil
+          :provider => nil,
+          :name     => 'dbus'
         )}
       end