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

Remove some tab/space issues in previous commits.

Browse source
This commit is contained in:
Michael DeHaan 2013-02-26 20:30:33 -05:00
parent c1b7d1bd48
commit 6a7d30d2c2
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ec2
View file

@ -248,9 +248,7 @@ def main():
} }
instances.append(d) instances.append(d)
result = {"changed": True, module.exit_json(changed=True, instances=instances)
"instances": instances }
module.exit_json(**result)
# this is magic, see lib/ansible/module_common.py # this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>> #<<INCLUDE_ANSIBLE_MODULE_COMMON>>

2
postgresql_db
View file

@ -149,7 +149,7 @@ def main():
encoding=dict(default=""), encoding=dict(default=""),
state=dict(default="present", choices=["absent", "present"]), state=dict(default="present", choices=["absent", "present"]),
), ),
supports_check_mode = True supports_check_mode = True
) )
if not postgresqldb_found: if not postgresqldb_found:

8
postgresql_user
View file

@ -376,7 +376,7 @@ def main():
fail_on_user=dict(default='yes'), fail_on_user=dict(default='yes'),
role_attr_flags=dict(default='') role_attr_flags=dict(default='')
), ),
supports_check_mode = True supports_check_mode = True
) )
user = module.params["user"] user = module.params["user"]
@ -419,7 +419,7 @@ def main():
if user_exists(cursor, user): if user_exists(cursor, user):
if module.check_mode: if module.check_mode:
kw['changed'] = True kw['changed'] = True
module.exit_json(**kw) module.exit_json(**kw)
changed = user_alter(cursor, user, password, role_attr_flags) changed = user_alter(cursor, user, password, role_attr_flags)
@ -429,7 +429,7 @@ def main():
module.fail_json(msg=msg) module.fail_json(msg=msg)
if module.check_mode: if module.check_mode:
kw['changed'] = True kw['changed'] = True
module.exit_json(**kw) module.exit_json(**kw)
changed = user_add(cursor, user, password, role_attr_flags) changed = user_add(cursor, user, password, role_attr_flags)
@ -438,7 +438,7 @@ def main():
if user_exists(cursor, user): if user_exists(cursor, user):
if module.check_mode: if module.check_mode:
kw['changed'] = True kw['changed'] = True
kw['user_removed'] = True kw['user_removed'] = True
module.exit_json(**kw) module.exit_json(**kw)

2
setup
View file

@ -193,7 +193,7 @@ class Facts(object):
self.facts['os_family'] = self.facts['distribution'] self.facts['os_family'] = self.facts['distribution']
if self.facts['distribution'] in OS_FAMILY: if self.facts['distribution'] in OS_FAMILY:
self.facts['os_family'] = OS_FAMILY[self.facts['distribution']] self.facts['os_family'] = OS_FAMILY[self.facts['distribution']]
def get_cmdline(self): def get_cmdline(self):
data = get_file_content('/proc/cmdline') data = get_file_content('/proc/cmdline')