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

Modify consul certificate validation bypass keyword from 'verify' to 'validate_certs'

Browse source
This commit is contained in:
Chris Tooley 2016-03-23 13:23:30 +00:00
parent 516f7d98e7
commit 04982da9b8
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clustering/consul.py
View file

@ -77,7 +77,7 @@ options:
required: false
default: http
version_added: "2.1"
verify:
validate_certs:
description:
- whether to verify the tls certificate of the consul agent
required: false
@ -321,7 +321,7 @@ def get_consul_api(module, token=None):
return consul.Consul(host=module.params.get('host'),
port=module.params.get('port'),
scheme=module.params.get('scheme'),
verify=module.params.get('verify'),
validate_certs=module.params.get('validate_certs'),
token=module.params.get('token'))
@ -518,7 +518,7 @@ def main():
host=dict(default='localhost'),
port=dict(default=8500, type='int'),
scheme=dict(required=False, default='http'),
verify=dict(required=False, default=True, type='bool'),
validate_certs=dict(required=False, default=True, type='bool'),
check_id=dict(required=False),
check_name=dict(required=False),
check_node=dict(required=False),

6
clustering/consul_acl.py
View file

@ -75,7 +75,7 @@ options:
required: false
default: http
version_added: "2.1"
verify:
validate_certs:
description:
- whether to verify the tls certificate of the consul agent
required: false
@ -313,7 +313,7 @@ def get_consul_api(module, token=None):
return consul.Consul(host=module.params.get('host'),
port=module.params.get('port'),
scheme=module.params.get('scheme'),
verify=module.params.get('verify'),
validate_certs=module.params.get('validate_certs'),
token=token)
def test_dependencies(module):
@ -330,7 +330,7 @@ def main():
mgmt_token=dict(required=True, no_log=True),
host=dict(default='localhost'),
scheme=dict(required=False, default='http'),
verify=dict(required=False, default=True),
validate_certs=dict(required=False, default=True),
name=dict(required=False),
port=dict(default=8500, type='int'),
rules=dict(default=None, required=False, type='list'),

6
clustering/consul_kv.py
View file

@ -105,7 +105,7 @@ options:
required: false
default: http
version_added: "2.1"
verify:
validate_certs:
description:
- whether to verify the tls certificate of the consul agent
required: false
@ -231,7 +231,7 @@ def get_consul_api(module, token=None):
return consul.Consul(host=module.params.get('host'),
port=module.params.get('port'),
scheme=module.params.get('scheme'),
verify=module.params.get('verify'),
validate_certs=module.params.get('validate_certs'),
token=module.params.get('token'))
def test_dependencies(module):
@ -247,7 +247,7 @@ def main():
key=dict(required=True),
host=dict(default='localhost'),
scheme=dict(required=False, default='http'),
verify=dict(required=False, default=True),
validate_certs=dict(required=False, default=True),
port=dict(default=8500, type='int'),
recurse=dict(required=False, type='bool'),
retrieve=dict(required=False, default=True),

4
clustering/consul_session.py
View file

@ -94,7 +94,7 @@ options:
required: false
default: http
version_added: "2.1"
verify:
validate_certs:
description:
- whether to verify the tls certificate of the consul agent
required: false
@ -257,7 +257,7 @@ def main():
host=dict(default='localhost'),
port=dict(default=8500, type='int'),
scheme=dict(required=False, default='http'),
verify=dict(required=False, default=True),
validate_certs=dict(required=False, default=True),
id=dict(required=False),
name=dict(required=False),
node=dict(required=False),