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

Use get_bin_path for blkid and add some aliases to the filesystem module.

Browse source
This commit is contained in:
Michael DeHaan 2013-06-10 10:39:19 -04:00
parent 36e9cf5d7d
commit 790a145f6c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/system/filesystem
View file

@ -56,8 +56,8 @@ notes:
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
fstype=dict(required=True), fstype=dict(required=True, aliases=['type']),
dev=dict(required=True), dev=dict(required=True, aliases=['device']),
opts=dict(), opts=dict(),
force=dict(type='bool', default='no'), force=dict(type='bool', default='no'),
), ),
@ -74,7 +74,9 @@ def main():
if not os.path.exists(dev): if not os.path.exists(dev):
module.fail_json(msg="Device %s not found."%dev) module.fail_json(msg="Device %s not found."%dev)
rc,raw_fs,err = module.run_command("blkid -o value -s TYPE %s"%(dev)) cmd = module.get_bin_path('blkid', required=True)
rc,raw_fs,err = module.run_command("%s -o value -s TYPE %s" % (cmd, dev))
fs = raw_fs.strip() fs = raw_fs.strip()