Do not configure selinux/apparmor when setup cloudstack agent

Author: weizhouapache

python/lib/cloudutils/serviceConfig.py

@@ -525,6 +525,8 @@ def __init__(self, syscfg):
         self.serviceName = "Apparmor"
 
     def config(self):
+        return True
+
         try:
             cmd = bash("service apparmor status")
             if not cmd.isSuccess() or cmd.getStdout() == "":
@@ -559,6 +561,8 @@ def __init__(self, syscfg):
         self.serviceName = "SElinux"
 
     def config(self):
+        return True
+
         selinuxEnabled = True
 
         if not bash("selinuxenabled").isSuccess():

scripts/vm/hypervisor/kvm/setup_agent.sh

@@ -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";