cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix service_mgr fact collection (#32086)

Browse source 
The platform/distro/etc facts were being passed in
correctly, but service_mgr.py was looking up the
wrong names ('system' vs 'ansible_system') resulting
in service_mgr falling back to default 'service' result.

Fixes #30753, #31095
This commit is contained in:
Adrian Likins 2017-10-24 15:15:01 -04:00 committed by GitHub
parent ad3f4b953a
commit 6203e899f0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/module_utils/facts/system/service_mgr.py
View file

@ -105,22 +105,22 @@ class ServiceMgrFactCollector(BaseFactCollector):
# FIXME: replace with a system->service_mgr_name map? # FIXME: replace with a system->service_mgr_name map?
# start with the easy ones # start with the easy ones
elif collected_facts.get('distribution', None) == 'MacOSX': elif collected_facts.get('ansible_distribution', None) == 'MacOSX':
# FIXME: find way to query executable, version matching is not ideal # FIXME: find way to query executable, version matching is not ideal
if LooseVersion(platform.mac_ver()[0]) >= LooseVersion('10.4'): if LooseVersion(platform.mac_ver()[0]) >= LooseVersion('10.4'):
service_mgr_name = 'launchd' service_mgr_name = 'launchd'
else: else:
service_mgr_name = 'systemstarter' service_mgr_name = 'systemstarter'
elif 'BSD' in collected_facts.get('system', '') or collected_facts.get('system') in ['Bitrig', 'DragonFly']: elif 'BSD' in collected_facts.get('ansible_system', '') or collected_facts.get('ansible_system') in ['Bitrig', 'DragonFly']:
# FIXME: we might want to break out to individual BSDs or 'rc' # FIXME: we might want to break out to individual BSDs or 'rc'
service_mgr_name = 'bsdinit' service_mgr_name = 'bsdinit'
elif collected_facts.get('system') == 'AIX': elif collected_facts.get('ansible_system') == 'AIX':
service_mgr_name = 'src' service_mgr_name = 'src'
elif collected_facts.get('system') == 'SunOS': elif collected_facts.get('ansible_system') == 'SunOS':
service_mgr_name = 'smf' service_mgr_name = 'smf'
elif collected_facts.get('distribution') == 'OpenWrt': elif collected_facts.get('ansible_distribution') == 'OpenWrt':
service_mgr_name = 'openwrt_init' service_mgr_name = 'openwrt_init'
elif collected_facts.get('system') == 'Linux': elif collected_facts.get('ansible_system') == 'Linux':
# FIXME: mv is_systemd_managed # FIXME: mv is_systemd_managed
if self.is_systemd_managed(module=module): if self.is_systemd_managed(module=module):
service_mgr_name = 'systemd' service_mgr_name = 'systemd'