etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudutils: remove securityPolicyConfigUbuntu and securityPolicyConfigRedHat

This commit is contained in:
Wei Zhou 2026-06-08 11:18:44 +02:00
parent a5721bee01
commit 1325b34721
No known key found for this signature in database
GPG Key ID: 1503DFE7C8226103
2 changed files with 0 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
python/lib/cloudutils/serviceConfig.py
View File

@ -519,83 +519,6 @@ class hostConfig(serviceCfgBase):
logging.debug(e)
return False
class securityPolicyConfigUbuntu(serviceCfgBase):
def __init__(self, syscfg):
super(securityPolicyConfigUbuntu, self).__init__(syscfg)
self.serviceName = "Apparmor"
def config(self):
return True
try:
cmd = bash("service apparmor status")
if not cmd.isSuccess() or cmd.getStdout() == "":
self.spRunning = False
return True
if not bash("apparmor_status |grep libvirt").isSuccess():
return True
bash("ln -s /etc/apparmor.d/usr.sbin.libvirtd /etc/apparmor.d/disable/")
bash("ln -s /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper /etc/apparmor.d/disable/")
bash("apparmor_parser -R /etc/apparmor.d/usr.sbin.libvirtd")
bash("apparmor_parser -R /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper")
return True
except:
raise CloudRuntimeException("Failed to configure apparmor, please see the /var/log/cloudstack/agent/setup.log for detail, \
or you can manually disable it before starting myCloud")
def restore(self):
return True
try:
self.syscfg.svo.enableService("apparmor")
self.syscfg.svo.startService("apparmor")
return True
except:
logging.debug(formatExceptionInfo())
return False
class securityPolicyConfigRedhat(serviceCfgBase):
def __init__(self, syscfg):
super(securityPolicyConfigRedhat, self).__init__(syscfg)
self.serviceName = "SElinux"
def config(self):
return True
selinuxEnabled = True
if not bash("selinuxenabled").isSuccess():
selinuxEnabled = False
if selinuxEnabled:
try:
bash("setenforce 0")
cfo = configFileOps("/etc/selinux/config", self)
cfo.replace_line("SELINUX=", "SELINUX=permissive")
return True
except:
raise CloudRuntimeException("Failed to configure selinux, please see the /var/log/cloudstack/agent/setup.log for detail, \
or you can manually disable it before starting myCloud")
else:
return True
def restore(self):
return True
try:
bash("setenforce 1")
return True
except:
logging.debug(formatExceptionInfo())
return False
class securityPolicyConfigSUSE(securityPolicyConfigRedhat):
pass
def configure_libvirt_tls(tls_enabled=False, cfo=None):
save = False
if not cfo:

6
python/lib/cloudutils/syscfg.py
View File

@ -167,7 +167,6 @@ class sysConfigAgentUbuntu(sysConfigAgent):
self.svo = serviceOpsUbuntu()
self.services = [hostConfig(self),
securityPolicyConfigUbuntu(self),
networkConfigUbuntu(self),
libvirtConfigUbuntu(self),
firewallConfigUbuntu(self),
@ -179,7 +178,6 @@ class sysConfigEL5(sysConfigAgentRedhatBase):
def __init__(self, glbEnv):
super(sysConfigEL5, self).__init__(glbEnv)
self.services = [hostConfig(self),
securityPolicyConfigRedhat(self),
networkConfigRedhat(self),
libvirtConfigRedhat(self),
firewallConfigAgent(self),
@ -192,7 +190,6 @@ class sysConfigEL6(sysConfigAgentRedhatBase):
super(sysConfigEL6, self).__init__(glbEnv)
self.services = [hostConfig(self),
cgroupConfig(self),
securityPolicyConfigRedhat(self),
networkConfigRedhat(self),
libvirtConfigRedhat(self),
firewallConfigAgent(self),
@ -204,7 +201,6 @@ class sysConfigEL7(sysConfigAgentRedhat7Base):
def __init__(self, glbEnv):
super(sysConfigEL7, self).__init__(glbEnv)
self.services = [hostConfig(self),
securityPolicyConfigRedhat(self),
networkConfigRedhat(self),
libvirtConfigRedhat(self),
firewallConfigAgent(self),
@ -216,7 +212,6 @@ class sysConfigEL(sysConfigAgentELBase):
def __init__(self, glbEnv):
super(sysConfigEL, self).__init__(glbEnv)
self.services = [hostConfig(self),
securityPolicyConfigRedhat(self),
networkConfigRedhat(self),
libvirtConfigRedhat(self),
firewallConfigAgent(self),
@ -227,7 +222,6 @@ class sysConfigSUSE(sysConfigAgentSUSE):
def __init__(self, glbEnv):
super(sysConfigSUSE, self).__init__(glbEnv)
self.services = [hostConfig(self),
securityPolicyConfigSUSE(self),
networkConfigSUSE(self),
libvirtConfigSUSE(self),
firewallConfigAgent(self),