apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix cloud-setup-agent, if selinux is disabled, should return successful, instead of raise an exception

Browse Source
This commit is contained in:
Edison Su 2011-07-18 17:50:02 -07:00
parent 5590cd93ce
commit a89f7c0866
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,9 @@ class serviceCfgBase(object):
result = False result = False
try: try:
result = self.config() result = self.config()
if result is None:
result = False
self.status = result self.status = result
writeProgressBar(None, result) writeProgressBar(None, result)
return result return result
@ -369,7 +372,9 @@ class securityPolicyConfigRedhat(serviceCfgBase):
except: except:
raise CloudRuntimeException("Failed to configure selinux, please see the /var/log/cloud/setupAgent.log for detail, \ raise CloudRuntimeException("Failed to configure selinux, please see the /var/log/cloud/setupAgent.log for detail, \
or you can manually disable it before starting myCloud") or you can manually disable it before starting myCloud")
else:
return True
def restore(self): def restore(self):
try: try:
bash("setenforce 1") bash("setenforce 1")

1
python/lib/cloudutils/utilities.py
View File

@ -71,6 +71,7 @@ def initLoging(logFile=None):
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
def writeProgressBar(msg, result): def writeProgressBar(msg, result):
output = "[%-6s]\n"%"Failed"
if msg is not None: if msg is not None:
output = "%-30s"%msg output = "%-30s"%msg
elif result is True: elif result is True: