From 7e38d711c20c8457d491b7506484223641c9bd87 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 5 Mar 2021 11:07:34 +0530 Subject: [PATCH 1/3] Prevent adding --listen parameter when libvirt version > 5.6 --- python/lib/cloudutils/serviceConfig.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py index 4cbab59560d0..97582ee0004f 100755 --- a/python/lib/cloudutils/serviceConfig.py +++ b/python/lib/cloudutils/serviceConfig.py @@ -22,6 +22,8 @@ from .configFileOps import configFileOps import os import shutil +from distutils.version import StrictVersion + # exit() error constants Unknown = 0 @@ -533,8 +535,12 @@ def config(self): cfo = configFileOps("/etc/sysconfig/libvirtd", self) if distro in (CentOS6,RHEL6): cfo.addEntry("export CGROUP_DAEMON", "'cpu:/virt'") - cfo.addEntry("LIBVIRTD_ARGS", "-l") - cfo.save() + libvirtVersion = bash("virsh --version") + if not libvirtVersion.isSuccess() or libvirtVersion.getStdout() == "": + raise CloudRuntimeException("Libvirt not installed!") + if StrictVersion(str(libvirtVersion.getStdout())) <= StrictVersion('5.6'): + cfo.addEntry("LIBVIRTD_ARGS", "-l") + cfo.save() filename = "/etc/libvirt/qemu.conf" From a8a5b3c9777d3545029cee74105a4f6d167b449e Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 5 Mar 2021 11:45:42 +0530 Subject: [PATCH 2/3] mask libvirtd sockets --- python/lib/cloudutils/serviceConfig.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py index 97582ee0004f..280103103665 100755 --- a/python/lib/cloudutils/serviceConfig.py +++ b/python/lib/cloudutils/serviceConfig.py @@ -535,12 +535,14 @@ def config(self): cfo = configFileOps("/etc/sysconfig/libvirtd", self) if distro in (CentOS6,RHEL6): cfo.addEntry("export CGROUP_DAEMON", "'cpu:/virt'") - libvirtVersion = bash("virsh --version") - if not libvirtVersion.isSuccess() or libvirtVersion.getStdout() == "": - raise CloudRuntimeException("Libvirt not installed!") - if StrictVersion(str(libvirtVersion.getStdout())) <= StrictVersion('5.6'): - cfo.addEntry("LIBVIRTD_ARGS", "-l") - cfo.save() + cfo.addEntry("LIBVIRTD_ARGS", "-l") + cfo.save() + if os.path.exists("/lib/systemd/system/libvirtd.socket"): + bash("/bin/systemctl mask libvirtd.socket"); + bash("/bin/systemctl mask libvirtd-ro.socket"); + bash("/bin/systemctl mask libvirtd-admin.socket"); + bash("/bin/systemctl mask libvirtd-tls.socket"); + bash("/bin/systemctl mask libvirtd-tcp.socket"); filename = "/etc/libvirt/qemu.conf" From 69982c9a1d6b553ff416e4c47a82c77edad3e563 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 5 Mar 2021 13:01:49 +0530 Subject: [PATCH 3/3] remove unused import --- python/lib/cloudutils/serviceConfig.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py index 280103103665..8294914e90ed 100755 --- a/python/lib/cloudutils/serviceConfig.py +++ b/python/lib/cloudutils/serviceConfig.py @@ -22,8 +22,6 @@ from .configFileOps import configFileOps import os import shutil -from distutils.version import StrictVersion - # exit() error constants Unknown = 0