Update package manager fact innards to a list of dicts

reviewable/pr18780/r1
Stephen Fromm 12 years ago
parent 6e7b94ad32
commit dc8c0ea467

15
setup

@ -54,9 +54,12 @@ class Facts(object):
'/etc/vmware-release': 'VMwareESX' } '/etc/vmware-release': 'VMwareESX' }
SELINUX_MODE_DICT = { 1: 'enforcing', 0: 'permissive', -1: 'disabled' } SELINUX_MODE_DICT = { 1: 'enforcing', 0: 'permissive', -1: 'disabled' }
PKG_MGR_DICT = { '/usr/bin/yum' : 'yum', # A list of dicts. If there is a platform with more than one
'/usr/bin/apt-get' : 'apt', # package manager, put the preferred one last. If there is an
'/usr/bin/zypper' : 'zypper' } # ansible module, use that as the value for the 'name' key.
PKG_MGRS = [ { 'path' : '/usr/bin/yum', 'name' : 'yum' },
{ 'path' : '/usr/bin/apt-get', 'name' : 'apt' },
{ 'path' : '/usr/bin/zypper', 'name' : 'zypper' } ]
def __init__(self): def __init__(self):
self.facts = {} self.facts = {}
@ -140,9 +143,9 @@ class Facts(object):
def get_pkg_mgr_facts(self): def get_pkg_mgr_facts(self):
self.facts['pkg_mgr'] = 'unknown' self.facts['pkg_mgr'] = 'unknown'
for (path, name) in Facts.PKG_MGR_DICT.items(): for pkg in Facts.PKG_MGRS:
if os.path.exists(path): if os.path.exists(pkg['path']):
self.facts['pkg_mgr'] = name self.facts['pkg_mgr'] = pkg['name']
def get_selinux_facts(self): def get_selinux_facts(self):
if not HAVE_SELINUX: if not HAVE_SELINUX:

Loading…
Cancel
Save