shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Add special case to scan_services that fixes SLES11 scan failure issue

Browse Source
This commit is contained in:
AlanCoding 2016-01-19 09:54:25 -05:00
parent faea43a5c2
commit f956ec15fa
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/plugins/library/scan_services.py
View File

@ -97,6 +97,13 @@ class ServiceScanService(BaseService):
#print '%s --status-all | grep -E "is (running|stopped)"' % service_path #print '%s --status-all | grep -E "is (running|stopped)"' % service_path
p = re.compile('(?P<service>.*?)\s+[0-9]:(?P<rl0>on|off)\s+[0-9]:(?P<rl1>on|off)\s+[0-9]:(?P<rl2>on|off)\s+[0-9]:(?P<rl3>on|off)\s+[0-9]:(?P<rl4>on|off)\s+[0-9]:(?P<rl5>on|off)\s+[0-9]:(?P<rl6>on|off)') p = re.compile('(?P<service>.*?)\s+[0-9]:(?P<rl0>on|off)\s+[0-9]:(?P<rl1>on|off)\s+[0-9]:(?P<rl2>on|off)\s+[0-9]:(?P<rl3>on|off)\s+[0-9]:(?P<rl4>on|off)\s+[0-9]:(?P<rl5>on|off)\s+[0-9]:(?P<rl6>on|off)')
rc, stdout, stderr = self.module.run_command('%s' % chkconfig_path, use_unsafe_shell=True) rc, stdout, stderr = self.module.run_command('%s' % chkconfig_path, use_unsafe_shell=True)
# extra flags needed for SLES11
if not any(p.match(line) for line in stdout.split('\n')):
# If p pattern is not found but p_simple is, we have single-column ouptut
p_simple = re.compile('(?P<service>.*?)\s+(?P<rl0>on|off)')
if any(p_simple.match(line) for line in stdout.split('\n')):
# Try extra flags " -l --allservices" to output all columns
rc, stdout, stderr = self.module.run_command('%s -l --allservices' % chkconfig_path, use_unsafe_shell=True)
for line in stdout.split('\n'): for line in stdout.split('\n'):
m = p.match(line) m = p.match(line)
if m: if m: