diff --git a/libvirt/manifests/init.pp b/libvirt/manifests/init.pp index 75571fd..73dc2c3 100644 --- a/libvirt/manifests/init.pp +++ b/libvirt/manifests/init.pp @@ -84,11 +84,6 @@ class libvirt::kvm inherits libvirt::client { $package = [ "qemu-kvm", "rubygem-ruby-libvirt", "virt-install" ] } } - package { $package: - ensure => installed, - before => Service["libvirtd"], - require => User["qemu"], - } file { "/etc/sysconfig/libvirt-guests": ensure => present, mode => "0644", @@ -99,13 +94,10 @@ class libvirt::kvm inherits libvirt::client { } } "fedora": { - package { "qemu-kvm": - ensure => installed, - before => Service["libvirtd"], - require => User["qemu"], - } - package { "ruby-libvirt": - ensure => installed, + if versioncmp($::operatingsystemrelease, "23") < 0 { + $package = [ "qemu-kvm", "ruby-libvirt" ] + } else { + $package = [ "qemu-kvm", "rubygem-ruby-libvirt" ] } } default: { @@ -113,6 +105,12 @@ class libvirt::kvm inherits libvirt::client { } } + package { $package: + ensure => installed, + before => Service["libvirtd"], + require => User["qemu"], + } + augeas { "libvirtd.conf": incl => "/etc/libvirt/libvirtd.conf", lens => "Simplevars.lns",