External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-28 06:15:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add SUSE, OpenSuse and Debian to scan_packages

Browse Source 
Also strip the output of get_distribution() since the suse variants seem
to have extra whitespace in the string output.
This commit is contained in:
Matthew Jones
2015-11-24 12:15:37 -05:00
parent 13c80375ea
commit 772b7d201e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/plugins/library/scan_packages.py
View File

@@ -71,11 +71,13 @@ def deb_package_list():
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict()) argument_spec = dict())
import os
ans_dist = get_distribution() os.system('echo "%s" > /tmp/foo' % get_distribution())
if ans_dist in ('Centos', 'Centos linux', 'Red hat enterprise linux server', 'Amazon'): ans_dist = get_distribution().strip()
if ans_dist in ('Centos', 'Centos linux', 'Red hat enterprise linux server', 'Amazon', 'Suse linux enterprise server', 'Opensuse'):
os.system('echo "in rpm_package_list for %s" >> /tmp/foo' % ans_dist)
packages = rpm_package_list() packages = rpm_package_list()
elif ans_dist in ('Ubuntu'): elif ans_dist in ('Ubuntu', 'Debian'):
packages = deb_package_list() packages = deb_package_list()
else: else:
packages = None packages = None