tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libvirt: Fix libvirt install for Fedora 24.

Browse source
This commit is contained in:
Timo Makinen 2016-06-30 11:50:32 +03:00
parent 18a0cd1bab
commit b9fe0508e3
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libvirt/manifests/init.pp
View file

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