add validate_certs to zabbix_template and move documentation for common options to zabbix module_doc_fragment (#31838)

This commit is contained in:
Eike Frost 2017-10-17 17:37:54 +02:00 committed by ansibot
parent 0a89873df9
commit 1d14016087

View file

@ -36,30 +36,8 @@ author:
- "@sookido" - "@sookido"
requirements: requirements:
- "python >= 2.6" - "python >= 2.6"
- zabbix-api - "zabbix-api >= 0.5.3"
options: options:
server_url:
description:
- Url of Zabbix server, with protocol (http or https).
required: true
login_user:
description:
- name of user to login to zabbix
required: true
login_password:
description:
- password for user to login to zabbix
required: true
http_login_user:
description:
- Basic Auth login
required: false
default: None
http_login_password:
description:
- Basic Auth password
required: false
default: None
template_name: template_name:
description: description:
- Name of zabbix template - Name of zabbix template
@ -87,11 +65,9 @@ options:
required: false required: false
choices: [ present, absent] choices: [ present, absent]
default: "present" default: "present"
timeout:
description: extends_documentation_fragment:
- The timeout of API request (seconds). - zabbix
required: false
default: 10
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -212,6 +188,7 @@ def main():
http_login_user=dict(type='str', required=False, default=None), http_login_user=dict(type='str', required=False, default=None),
http_login_password=dict(type='str', required=False, http_login_password=dict(type='str', required=False,
default=None, no_log=True), default=None, no_log=True),
validate_certs=dict(type='bool', required=False, default=True),
template_name=dict(type='str', required=True), template_name=dict(type='str', required=True),
template_groups=dict(type='list', required=True), template_groups=dict(type='list', required=True),
link_templates=dict(type='list', required=False), link_templates=dict(type='list', required=False),
@ -233,6 +210,7 @@ def main():
login_password = module.params['login_password'] login_password = module.params['login_password']
http_login_user = module.params['http_login_user'] http_login_user = module.params['http_login_user']
http_login_password = module.params['http_login_password'] http_login_password = module.params['http_login_password']
validate_certs = module.params['validate_certs']
template_name = module.params['template_name'] template_name = module.params['template_name']
template_groups = module.params['template_groups'] template_groups = module.params['template_groups']
link_templates = module.params['link_templates'] link_templates = module.params['link_templates']
@ -246,7 +224,7 @@ def main():
# login to zabbix # login to zabbix
try: try:
zbx = ZabbixAPI(server_url, timeout=timeout, zbx = ZabbixAPI(server_url, timeout=timeout,
user=http_login_user, passwd=http_login_password) user=http_login_user, passwd=http_login_password, validate_certs=validate_certs)
zbx.login(login_user, login_password) zbx.login(login_user, login_password)
except Exception as e: except Exception as e:
module.fail_json(msg="Failed to connect to Zabbix server: %s" % e) module.fail_json(msg="Failed to connect to Zabbix server: %s" % e)