diff options
| -rw-r--r-- | lib/postmap | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/postmap b/lib/postmap index c0bf03b..5691c48 100644 --- a/lib/postmap +++ b/lib/postmap @@ -51,52 +51,54 @@ def compile(cmd, instance, db, src): if db: src = "%s:%s" % (db,src) cmd.append(src) subprocess.check_output(cmd, stderr=subprocess.STDOUT) def main(): module = AnsibleModule( argument_spec = dict( src = dict( required=True ), db = dict( choices=['btree','cdb','hash'] ), cmd = dict( choices=['postmap','postalias'], default='postmap' ), instance = dict( required=False ) ), add_file_common_args=True, supports_check_mode=True ) params = module.params - src = params['src'] - cmd = params['cmd'] + src = params['src'] + db = params['db'] + cmd = params['cmd'] + instance = params['instance'] if os.path.isabs(src): src = src else: module.fail_json(msg="absolute paths are required") if not os.path.exists(src): module.fail_json(src=src, msg="no such file") try: - dst = "%s.%s" % (src, file_suffix(params['instance'], params['db'])) + dst = "%s.%s" % (src, file_suffix(instance, db)) params['dest'] = dst file_args = module.load_file_common_arguments(params) changed = False msg = None if not os.path.exists(dst) or os.path.getmtime(dst) <= os.path.getmtime(src): changed = True if not module.check_mode: - msg = compile( params['cmd'], params['instance'], params['db'], src) + msg = compile( cmd, instance, db, src) except subprocess.CalledProcessError, e: module.fail_json(rv=e.returncode, msg=e.output.rstrip()) changed = module.set_file_attributes_if_different(file_args, changed) module.exit_json(changed=changed, msg=msg) # this is magic, see lib/ansible/module_common.py #<<INCLUDE_ANSIBLE_MODULE_COMMON>> main() |