mirror of
https://github.com/ansible/awx.git
synced 2026-03-03 01:38:50 -03:30
Refactor scan_packages for os detection
* Use setup facts ansible_os_family for os family detection now. Add support for Suse and it's ilk (which has a pretty ugly OS family implementation
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
scan_use_recursive: false
|
scan_use_recursive: false
|
||||||
tasks:
|
tasks:
|
||||||
- scan_packages:
|
- scan_packages:
|
||||||
|
os_family: '{{ ansible_os_family }}'
|
||||||
- scan_services:
|
- scan_services:
|
||||||
- scan_files:
|
- scan_files:
|
||||||
paths: '{{ scan_file_paths }}'
|
paths: '{{ scan_file_paths }}'
|
||||||
|
|||||||
@@ -70,12 +70,12 @@ def deb_package_list():
|
|||||||
|
|
||||||
def main():
|
def main():
|
||||||
module = AnsibleModule(
|
module = AnsibleModule(
|
||||||
argument_spec = dict())
|
argument_spec = dict(os_family=dict(required=True))
|
||||||
ans_dist = get_distribution().strip()
|
)
|
||||||
if ans_dist in ('Centos', 'Centos linux', 'Red hat enterprise linux server', 'Amazon', 'Suse linux enterprise server', 'Opensuse'):
|
ans_os = module.params['os_family']
|
||||||
os.system('echo "in rpm_package_list for %s" >> /tmp/foo' % ans_dist)
|
if ans_os in ('RedHat', 'Suse', 'openSUSE Leap'):
|
||||||
packages = rpm_package_list()
|
packages = rpm_package_list()
|
||||||
elif ans_dist in ('Ubuntu', 'Debian'):
|
elif ans_os == 'Debian':
|
||||||
packages = deb_package_list()
|
packages = deb_package_list()
|
||||||
else:
|
else:
|
||||||
packages = None
|
packages = None
|
||||||
|
|||||||
Reference in New Issue
Block a user