aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-16 15:25:07 +0000
committerMichael Scherer <misc@mageia.org>2012-01-16 15:25:07 +0000
commit82abd6413b39762b9387aefa09d1e0acdbce44e3 (patch)
tree3ededc4cd128381a9b473a04d11495caf0a14f9e
parent717afafaf5b7ad353794d46be9eaaa67877eef01 (diff)
downloadpuppet-82abd6413b39762b9387aefa09d1e0acdbce44e3.tar
puppet-82abd6413b39762b9387aefa09d1e0acdbce44e3.tar.gz
puppet-82abd6413b39762b9387aefa09d1e0acdbce44e3.tar.bz2
puppet-82abd6413b39762b9387aefa09d1e0acdbce44e3.tar.xz
puppet-82abd6413b39762b9387aefa09d1e0acdbce44e3.zip
cleaning and refactoring of the module libvirt
-rw-r--r--modules/libvirtd/manifests/init.pp23
1 files changed, 3 insertions, 20 deletions
diff --git a/modules/libvirtd/manifests/init.pp b/modules/libvirtd/manifests/init.pp
index 6297bfb3..d73fed1c 100644
--- a/modules/libvirtd/manifests/init.pp
+++ b/modules/libvirtd/manifests/init.pp
@@ -9,32 +9,21 @@ class libvirtd {
}
service { libvirtd:
- ensure => running,
- path => "/etc/init.d/libvirtd",
+ require => Package['libvirt-utils'],
}
#TODO remove once libvirt package is fixed to manage the directory
- file { "/etc/libvirt/storage":
+ file { ["/etc/libvirt/storage","/etc/libvirt/storage/autostart"]:
ensure => directory,
require => Package['libvirt-utils'],
}
- file { "/etc/libvirt/storage/autostart":
- ensure => directory,
- }
-
file { "/usr/local/bin/storage_add.py":
- ensure => present,
- owner => root,
- group => root,
mode => 755,
source => "puppet:///modules/libvirtd/storage_add.py",
}
file { "/usr/local/bin/network_add.py":
- ensure => present,
- owner => root,
- group => root,
mode => 755,
source => "puppet:///modules/libvirtd/network_add.py",
}
@@ -43,9 +32,7 @@ class libvirtd {
class kvm inherits base {
# pull cyrus-sasl, should be checked
- package { "qemu":
-
- }
+ package { "qemu": }
}
@@ -54,10 +41,6 @@ class libvirtd {
# to pull polkit and create the directory
include libvirtd::base
file { "/etc/polkit-1/localauthority/50-local.d/50-$name-libvirt-remote-access.pkla":
- owner => root,
- group => root,
- mode => 644,
- ensure => present,
content => template("libvirtd/50-template-libvirt-remote-access.pkla"),
require => Package['libvirt-utils'],
}