Skip to content

Do not configure selinux/apparmor when setup cloudstack agent #13281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
weizhouapache wants to merge 5 commits into
base: main
Choose a base branch
from
+9 −234
Draft

Do not configure selinux/apparmor when setup cloudstack agent #13281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e96e6f
Do not configure selinux/apparmor when setup cloudstack agent
weizhouapache May 29, 2026
c6f9088
do not restore as well
weizhouapache May 29, 2026
9c0854e
test: set security_driver to selinux or apparmor
weizhouapache May 29, 2026
da6302c
libvirt: do not set security_driver to none in qemu.conf
weizhouapache Jun 1, 2026
9458007
test_vpc_redundant.py: fix logging
weizhouapache Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions python/lib/cloudutils/serviceConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,8 @@ def __init__(self, syscfg):
self.serviceName = "Apparmor"

def config(self):
return True
Comment thread
weizhouapache marked this conversation as resolved.
Comment thread
weizhouapache marked this conversation as resolved.

try:
cmd = bash("service apparmor status")
if not cmd.isSuccess() or cmd.getStdout() == "":
Expand All @@ -545,6 +547,8 @@ def config(self):
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")
Expand All @@ -559,6 +563,8 @@ def __init__(self, syscfg):
self.serviceName = "SElinux"

def config(self):
return True
Comment thread
weizhouapache marked this conversation as resolved.
Comment thread
weizhouapache marked this conversation as resolved.

selinuxEnabled = True

if not bash("selinuxenabled").isSuccess():
Expand All @@ -577,6 +583,8 @@ def config(self):
return True

def restore(self):
return True

try:
bash("setenforce 1")
return True
Expand Down Expand Up @@ -652,7 +660,6 @@ def config(self):
filename = "/etc/libvirt/qemu.conf"

cfo = configFileOps(filename, self)
cfo.addEntry("security_driver", "\"none\"")
cfo.addEntry("user", "\"root\"")
cfo.addEntry("group", "\"root\"")
cfo.addEntry("vnc_listen", "\"0.0.0.0\"")
Expand Down Expand Up @@ -690,7 +697,6 @@ def config(self):

filename = "/etc/libvirt/qemu.conf"
cfo = configFileOps(filename, self)
cfo.addEntry("security_driver", "\"none\"")
cfo.addEntry("user", "\"root\"")
cfo.addEntry("group", "\"root\"")
cfo.addEntry("vnc_listen", "\"0.0.0.0\"")
Expand Down Expand Up @@ -745,7 +751,6 @@ def config(self):
filename = "/etc/libvirt/qemu.conf"

cfo = configFileOps(filename, self)
cfo.addEntry("security_driver", "\"none\"")
cfo.addEntry("user", "\"root\"")
cfo.addEntry("group", "\"root\"")
configure_libvirt_tls(self.syscfg.env.secure, cfo)
Expand Down
228 changes: 0 additions & 228 deletions scripts/vm/hypervisor/kvm/setup_agent.sh
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,6 @@ private HostVO waitForHostConnect(long dcId, long podId, long clusterId, String

@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
// _setupAgentPath = Script.findScript(getPatchPath(),
// "setup_agent.sh");
_kvmPrivateNic = _configDao.getValue(Config.KvmPrivateNetwork.key());
if (_kvmPrivateNic == null) {
_kvmPrivateNic = "cloudbr0";
Expand Down
2 changes: 1 addition & 1 deletion test/integration/smoke/test_vpc_redundant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ def test_02_redundant_VPC_default_routes(self):
@attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers(self):
""" Create a redundant VPC with two networks with two VMs in each network """
self.logger.debug("Starting test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL")
self.logger.debug("Starting test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers")
self.query_routers()
self.networks.append(self.create_network(self.services["network_offering"], "10.1.1.1"))
self.check_routers_state()
Expand Down
Loading