From 82f3da502d17301b8751c3d77da3c4757d75f6bc Mon Sep 17 00:00:00 2001
From: Dan Fandrich <danf@mageia.org>
Date: Thu, 18 Jan 2024 17:51:59 -0800
Subject: Switch libvirt helpers to Python3

No code changes are needed. Also, drop support for older than mga7 since
the two nodes that need this are running that.
---
 modules/libvirtd/files/network_add.py |  2 +-
 modules/libvirtd/files/storage_add.py |  2 +-
 modules/libvirtd/manifests/init.pp    | 15 ++-------------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/modules/libvirtd/files/network_add.py b/modules/libvirtd/files/network_add.py
index a7382351..4ed63109 100644
--- a/modules/libvirtd/files/network_add.py
+++ b/modules/libvirtd/files/network_add.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import libvirt
 import os
 import IPy
diff --git a/modules/libvirtd/files/storage_add.py b/modules/libvirtd/files/storage_add.py
index c53b16bd..10369e36 100644
--- a/modules/libvirtd/files/storage_add.py
+++ b/modules/libvirtd/files/storage_add.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import libvirt
 import sys
 
diff --git a/modules/libvirtd/manifests/init.pp b/modules/libvirtd/manifests/init.pp
index fb6ffaed..52c3eada 100644
--- a/modules/libvirtd/manifests/init.pp
+++ b/modules/libvirtd/manifests/init.pp
@@ -5,24 +5,13 @@ 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',
-                  'dnsmasq-base',
-                  'netcat-openbsd',
-                  'iptables',
-                  'python-libvirt',
-                  'python-IPy']:
-
-        }
-} else {
         package {['libvirt-utils',
                   'dnsmasq',
                   'netcat-openbsd',
                   'iptables',
-                  'python2-libvirt',
-                  'python-IPy']:
+                  'python3-libvirt',
+                  'python3-IPy']:
         }
-}
         service { 'libvirtd':
             require => Package['libvirt-utils'],
         }
-- 
cgit v1.2.1