ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

updated capabilities to new way of module ref

Browse source
This commit is contained in:
Brian Coca 2016-04-13 14:30:46 -04:00
parent b63238ff2c
commit a5a6bcfbbf
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.py
View file

@ -353,7 +353,7 @@ class Facts(object):
self.facts['distribution'] = name self.facts['distribution'] = name
else: else:
self.facts['distribution'] = data.split()[0] self.facts['distribution'] = data.split()[0]
break break
elif name == 'Slackware': elif name == 'Slackware':
data = get_file_content(path) data = get_file_content(path)
if 'Slackware' in data: if 'Slackware' in data:
@ -361,7 +361,7 @@ class Facts(object):
version = re.findall('\w+[.]\w+', data) version = re.findall('\w+[.]\w+', data)
if version: if version:
self.facts['distribution_version'] = version[0] self.facts['distribution_version'] = version[0]
break break
elif name == 'OracleLinux': elif name == 'OracleLinux':
data = get_file_content(path) data = get_file_content(path)
if 'Oracle Linux' in data: if 'Oracle Linux' in data:
@ -700,9 +700,9 @@ class Facts(object):
self.facts['selinux']['type'] = 'unknown' self.facts['selinux']['type'] = 'unknown'
def get_caps_facts(self): def get_caps_facts(self):
capsh_path = module.get_bin_path('capsh') capsh_path = self.module.get_bin_path('capsh')
if capsh_path: if capsh_path:
rc, out, err = module.run_command([capsh_path, "--print"]) rc, out, err = self.module.run_command([capsh_path, "--print"])
enforced_caps = [] enforced_caps = []
enforced = 'NA' enforced = 'NA'
for line in out.split('\n'): for line in out.split('\n'):
@ -1105,9 +1105,9 @@ class LinuxHardware(Hardware):
uuids = dict() uuids = dict()
self.facts['mounts'] = [] self.facts['mounts'] = []
bind_mounts = [] bind_mounts = []
findmntPath = module.get_bin_path("findmnt") findmntPath = self.module.get_bin_path("findmnt")
if findmntPath: if findmntPath:
rc, out, err = module.run_command("%s -lnur" % ( findmntPath ), use_unsafe_shell=True) rc, out, err = self.module.run_command("%s -lnur" % ( findmntPath ), use_unsafe_shell=True)
if rc == 0: if rc == 0:
# find bind mounts, in case /etc/mtab is a symlink to /proc/mounts # find bind mounts, in case /etc/mtab is a symlink to /proc/mounts
for line in out.split('\n'): for line in out.split('\n'):