From 8e94d0902966de1e52ee6875332e386c6eb75a92 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Mon, 16 Sep 2019 12:12:49 +0300 Subject: fix up libvirtd init --- modules/libvirtd/manifests/init.pp | 18 +++++++++++------- 1 file 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'], } -- cgit v1.2.1