aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2019-09-16 12:12:49 +0300
committerThomas Backlund <tmb@mageia.org>2019-09-16 12:12:49 +0300
commit8e94d0902966de1e52ee6875332e386c6eb75a92 (patch)
tree0eb2fcf5958233989a905316f33847d00647cb5d
parent7168ead24b39fade5c45bfb07f63703e4a81ce13 (diff)
downloadpuppet-8e94d0902966de1e52ee6875332e386c6eb75a92.tar
puppet-8e94d0902966de1e52ee6875332e386c6eb75a92.tar.gz
puppet-8e94d0902966de1e52ee6875332e386c6eb75a92.tar.bz2
puppet-8e94d0902966de1e52ee6875332e386c6eb75a92.tar.xz
puppet-8e94d0902966de1e52ee6875332e386c6eb75a92.zip
fix up libvirtd init
-rw-r--r--modules/libvirtd/manifests/init.pp18
1 files changed, 11 insertions, 7 deletions
diff --git a/modules/libvirtd/manifests/init.pp b/modules/libvirtd/manifests/init.pp
index 0c7edf0d..fb6ffaed 100644
--- a/modules/libvirtd/manifests/init.pp
+++ b/modules/libvirtd/manifests/init.pp
@@ -5,20 +5,24 @@ class libvirtd {
# netcat-openbsd -> for ssh remote access
# iptables -> for dhcp, message error was quite puzzling
# python-* => needed for helper script
+if versioncmp($::lsbdistrelease, '7') < 0 {
package {['libvirt-utils',
- if versioncmp($::lsbdistrelease, '7') < 0 {
- 'dnsmasq',
- 'python2-libvirt',
- } else {
'dnsmasq-base',
- 'python-libvirt',
- }
'netcat-openbsd',
'iptables',
+ 'python-libvirt',
'python-IPy']:
}
-
+} else {
+ package {['libvirt-utils',
+ 'dnsmasq',
+ 'netcat-openbsd',
+ 'iptables',
+ 'python2-libvirt',
+ 'python-IPy']:
+ }
+}
service { 'libvirtd':
require => Package['libvirt-utils'],
}