DaanHoogland commented on code in PR #7114:
URL: https://github.com/apache/cloudstack/pull/7114#discussion_r1082200976
##########
python/lib/cloudutils/syscfg.py:
##########
@@ -222,6 +224,18 @@ def __init__(self, glbEnv):
nfsConfig(self),
cloudAgentConfig(self)]
+#it covers RHEL9
+class sysConfigRedhat9(sysConfigAgentRedhat8Base):
+ def __init__(self, glbEnv):
+ super(sysConfigRedhat9, self).__init__(glbEnv)
+ self.services = [hostConfig(self),
+ securityPolicyConfigRedhat(self),
+ networkConfigRedhat(self),
+ libvirtConfigRedhat(self),
+ firewallConfigAgent(self),
+ nfsConfig(self),
+ cloudAgentConfig(self)]
+
Review Comment:
this is exactly the same as sysConfigRedhat7 and sysConfigRedhat8 the extra
code adds nothing here.
##########
python/lib/cloudutils/serviceConfig.py:
##########
@@ -617,11 +617,8 @@ def config(self):
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");
+ bash("/bin/systemctl mask libvirtd.socket libvirtd-ro.socket
libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket");
+ bash("/bin/systemctl mask virtqemud.socket virtqemud-ro.socket
virtqemud-admin.socket virtqemud virtnetworkd virtstoraged");
Review Comment:
if making it long lines, why not all on one line. One fork instead of two.
```suggestion
bash("/bin/systemctl mask \
libvirtd.socket \
libvirtd-ro.socket \
libvirtd-admin.socket \
libvirtd-tls.socket \
libvirtd-tcp.socket \
virtqemud.socket \
virtqemud-ro.socket \
virtqemud-admin.socket \
virtqemud \
virtnetworkd \
virtstoraged");
```
##########
python/lib/cloudutils/serviceConfig.py:
##########
@@ -617,11 +617,8 @@ def config(self):
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");
+ bash("/bin/systemctl mask libvirtd.socket libvirtd-ro.socket
libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket");
+ bash("/bin/systemctl mask virtqemud.socket virtqemud-ro.socket
virtqemud-admin.socket virtqemud virtnetworkd virtstoraged");
Review Comment:
These are guarded by that condition, aren´t they, @weizhouapache ?
cc @rohityadavcloud
If it is the intention to mask all if "/lib/systemd/system/libvirtd.socket"
exists, this should work
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
