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

Add explicit argument_spec types to avoid misinterpretation and subsequent errors (i.e. getting an int instead of the expected str)

Browse source
This commit is contained in:
Eike Frost 2016-02-28 19:18:39 +00:00
parent 479f99678b
commit 47466242a3
5 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
monitoring/zabbix_group.py
View file

@ -150,10 +150,10 @@ class HostGroup(object):
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec=dict( argument_spec=dict(
server_url=dict(required=True, aliases=['url']), server_url=dict(type='str', required=True, aliases=['url']),
login_user=dict(required=True), login_user=dict(type='str', required=True),
login_password=dict(required=True, no_log=True), login_password=dict(type='str', required=True, no_log=True),
host_groups=dict(required=True, aliases=['host_group']), host_groups=dict(type='list', required=True, aliases=['host_group']),
state=dict(default="present", choices=['present','absent']), state=dict(default="present", choices=['present','absent']),
timeout=dict(type='int', default=10) timeout=dict(type='int', default=10)
), ),

18
monitoring/zabbix_host.py
View file

@ -367,18 +367,18 @@ class Host(object):
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec=dict( argument_spec=dict(
server_url=dict(required=True, aliases=['url']), server_url=dict(type='str', required=True, aliases=['url']),
login_user=dict(required=True), login_user=dict(rtype='str', equired=True),
login_password=dict(required=True, no_log=True), login_password=dict(type='str', required=True, no_log=True),
host_name=dict(required=True), host_name=dict(type='str', required=True),
host_groups=dict(required=False), host_groups=dict(type='list', required=False),
link_templates=dict(required=False), link_templates=dict(type='list', required=False),
status=dict(default="enabled", choices=['enabled', 'disabled']), status=dict(default="enabled", choices=['enabled', 'disabled']),
state=dict(default="present", choices=['present', 'absent']), state=dict(default="present", choices=['present', 'absent']),
timeout=dict(type='int', default=10), timeout=dict(type='int', default=10),
interfaces=dict(required=False), interfaces=dict(type='list', required=False),
force=dict(default=True, type='bool'), force=dict(type='bool', default=True),
proxy=dict(required=False) proxy=dict(type='str', required=False)
), ),
supports_check_mode=True supports_check_mode=True
) )

12
monitoring/zabbix_hostmacro.py
View file

@ -171,12 +171,12 @@ class HostMacro(object):
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec=dict( argument_spec=dict(
server_url=dict(required=True, aliases=['url']), server_url=dict(type='str', required=True, aliases=['url']),
login_user=dict(required=True), login_user=dict(type='str', required=True),
login_password=dict(required=True, no_log=True), login_password=dict(type='str', required=True, no_log=True),
host_name=dict(required=True), host_name=dict(type='str', required=True),
macro_name=dict(required=True), macro_name=dict(type='str', required=True),
macro_value=dict(required=True), macro_value=dict(type='str', required=True),
state=dict(default="present", choices=['present', 'absent']), state=dict(default="present", choices=['present', 'absent']),
timeout=dict(type='int', default=10) timeout=dict(type='int', default=10)
), ),

10
monitoring/zabbix_maintenance.py
View file

@ -266,14 +266,14 @@ def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec=dict( argument_spec=dict(
state=dict(required=False, default='present', choices=['present', 'absent']), state=dict(required=False, default='present', choices=['present', 'absent']),
server_url=dict(required=True, default=None, aliases=['url']), server_url=dict(type='str', required=True, default=None, aliases=['url']),
host_names=dict(type='list', required=False, default=None, aliases=['host_name']), host_names=dict(type='list', required=False, default=None, aliases=['host_name']),
minutes=dict(type='int', required=False, default=10), minutes=dict(type='int', required=False, default=10),
host_groups=dict(type='list', required=False, default=None, aliases=['host_group']), host_groups=dict(type='list', required=False, default=None, aliases=['host_group']),
login_user=dict(required=True), login_user=dict(type='str', required=True),
login_password=dict(required=True, no_log=True), login_password=dict(type='str', required=True, no_log=True),
name=dict(required=True), name=dict(type='str', required=True),
desc=dict(required=False, default="Created by Ansible"), desc=dict(type='str', required=False, default="Created by Ansible"),
collect_data=dict(type='bool', required=False, default=True), collect_data=dict(type='bool', required=False, default=True),
), ),
supports_check_mode=True, supports_check_mode=True,

6
monitoring/zabbix_screen.py
View file

@ -315,9 +315,9 @@ class Screen(object):
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec=dict( argument_spec=dict(
server_url=dict(required=True, aliases=['url']), server_url=dict(type='str', required=True, aliases=['url']),
login_user=dict(required=True), login_user=dict(type='str', required=True),
login_password=dict(required=True, no_log=True), login_password=dict(type='str', required=True, no_log=True),
timeout=dict(type='int', default=10), timeout=dict(type='int', default=10),
screens=dict(type='list', required=True) screens=dict(type='list', required=True)
), ),