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

Merged in oherrala/puppet (pull request #6)

Browse source
This commit is contained in:
Timo Mäkinen 2012-04-02 16:38:00 +03:00
commit 2758fb1a35
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libvirt/manifests/init.pp
View file

@ -29,10 +29,25 @@ class libvirt::client {
# #
class libvirt::kvm inherits libvirt::client { class libvirt::kvm inherits libvirt::client {
package { "qemu-kvm": case operatingsystem {
ensure => installed, centos,fedora: {
before => Service["libvirtd"], case $operatingsystemrelease {
require => [ User["qemu"], Group["qemu"] ], '/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 { if !$libvirt_admingroup {

4
python/manifests/init.pp
View file

@ -15,8 +15,8 @@ define python::setup::install($python="python") {
exec { "python-setup-install-${name}": exec { "python-setup-install-${name}":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin", path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
cwd => $name, cwd => "${name}",
command => "${python} setup.py install", command => "/bin/sh -c 'umask 022; ${python} setup.py install'",
creates => "${name}/build", creates => "${name}/build",
} }

4
util/manifests/init.pp
View file

@ -57,9 +57,9 @@ define util::extract::tar($source, $ensure=present, $strip=0, $preserve=false) {
} }
if $preserve { 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 { } 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}": exec { "tar-extract-${name}":