diff --git a/libvirt/manifests/init.pp b/libvirt/manifests/init.pp index 88abc0e..051e949 100644 --- a/libvirt/manifests/init.pp +++ b/libvirt/manifests/init.pp @@ -29,10 +29,25 @@ class libvirt::client { # class libvirt::kvm inherits libvirt::client { - package { "qemu-kvm": - ensure => installed, - before => Service["libvirtd"], - require => [ User["qemu"], Group["qemu"] ], + case operatingsystem { + centos,fedora: { + case $operatingsystemrelease { + '/5\.[0-9]+/': { + package { "kvm": + ensure => installed, + before => Service["libvirtd"], + require => [ User["qemu"], Group["qemu"] ], + } + } + default: { + package { "qemu-kvm": + ensure => installed, + before => Service["libvirtd"], + require => [ User["qemu"], Group["qemu"] ], + } + } + } + } } if !$libvirt_admingroup { diff --git a/python/manifests/init.pp b/python/manifests/init.pp index 87413cc..5a90d09 100644 --- a/python/manifests/init.pp +++ b/python/manifests/init.pp @@ -15,8 +15,8 @@ define python::setup::install($python="python") { exec { "python-setup-install-${name}": path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin", - cwd => $name, - command => "${python} setup.py install", + cwd => "${name}", + command => "/bin/sh -c 'umask 022; ${python} setup.py install'", creates => "${name}/build", } diff --git a/util/manifests/init.pp b/util/manifests/init.pp index ac34316..7aa6bfb 100644 --- a/util/manifests/init.pp +++ b/util/manifests/init.pp @@ -57,9 +57,9 @@ define util::extract::tar($source, $ensure=present, $strip=0, $preserve=false) { } if $preserve { - $command = "${cat} ${source} | ${tar} xf - --strip-components=${strip} -C ${name}" + $command = "/bin/sh -c 'umask 022; ${cat} ${source} | ${tar} xf - --strip-components=${strip} -C ${name}'" } else { - $command = "${cat} ${source} | ${tar} xf - --strip-components=${strip} -C ${name} --no-same-owner --no-same-permissions" + $command = "/bin/sh -c 'umask 022; ${cat} ${source} | ${tar} xf - --strip-components=${strip} -C ${name} --no-same-owner --no-same-permissions'" } exec { "tar-extract-${name}":