Modify consul certificate validation bypass keyword from 'verify' to 'validate_certs'
This commit is contained in:
parent
ca1efafc50
commit
b2c7d28f41
4 changed files with 11 additions and 11 deletions
|
@ -77,7 +77,7 @@ options:
|
||||||
required: false
|
required: false
|
||||||
default: http
|
default: http
|
||||||
version_added: "2.1"
|
version_added: "2.1"
|
||||||
verify:
|
validate_certs:
|
||||||
description:
|
description:
|
||||||
- whether to verify the tls certificate of the consul agent
|
- whether to verify the tls certificate of the consul agent
|
||||||
required: false
|
required: false
|
||||||
|
@ -321,7 +321,7 @@ def get_consul_api(module, token=None):
|
||||||
return consul.Consul(host=module.params.get('host'),
|
return consul.Consul(host=module.params.get('host'),
|
||||||
port=module.params.get('port'),
|
port=module.params.get('port'),
|
||||||
scheme=module.params.get('scheme'),
|
scheme=module.params.get('scheme'),
|
||||||
verify=module.params.get('verify'),
|
validate_certs=module.params.get('validate_certs'),
|
||||||
token=module.params.get('token'))
|
token=module.params.get('token'))
|
||||||
|
|
||||||
|
|
||||||
|
@ -518,7 +518,7 @@ def main():
|
||||||
host=dict(default='localhost'),
|
host=dict(default='localhost'),
|
||||||
port=dict(default=8500, type='int'),
|
port=dict(default=8500, type='int'),
|
||||||
scheme=dict(required=False, default='http'),
|
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_id=dict(required=False),
|
||||||
check_name=dict(required=False),
|
check_name=dict(required=False),
|
||||||
check_node=dict(required=False),
|
check_node=dict(required=False),
|
||||||
|
|
|
@ -75,7 +75,7 @@ options:
|
||||||
required: false
|
required: false
|
||||||
default: http
|
default: http
|
||||||
version_added: "2.1"
|
version_added: "2.1"
|
||||||
verify:
|
validate_certs:
|
||||||
description:
|
description:
|
||||||
- whether to verify the tls certificate of the consul agent
|
- whether to verify the tls certificate of the consul agent
|
||||||
required: false
|
required: false
|
||||||
|
@ -313,7 +313,7 @@ def get_consul_api(module, token=None):
|
||||||
return consul.Consul(host=module.params.get('host'),
|
return consul.Consul(host=module.params.get('host'),
|
||||||
port=module.params.get('port'),
|
port=module.params.get('port'),
|
||||||
scheme=module.params.get('scheme'),
|
scheme=module.params.get('scheme'),
|
||||||
verify=module.params.get('verify'),
|
validate_certs=module.params.get('validate_certs'),
|
||||||
token=token)
|
token=token)
|
||||||
|
|
||||||
def test_dependencies(module):
|
def test_dependencies(module):
|
||||||
|
@ -330,7 +330,7 @@ def main():
|
||||||
mgmt_token=dict(required=True, no_log=True),
|
mgmt_token=dict(required=True, no_log=True),
|
||||||
host=dict(default='localhost'),
|
host=dict(default='localhost'),
|
||||||
scheme=dict(required=False, default='http'),
|
scheme=dict(required=False, default='http'),
|
||||||
verify=dict(required=False, default=True),
|
validate_certs=dict(required=False, default=True),
|
||||||
name=dict(required=False),
|
name=dict(required=False),
|
||||||
port=dict(default=8500, type='int'),
|
port=dict(default=8500, type='int'),
|
||||||
rules=dict(default=None, required=False, type='list'),
|
rules=dict(default=None, required=False, type='list'),
|
||||||
|
|
|
@ -105,7 +105,7 @@ options:
|
||||||
required: false
|
required: false
|
||||||
default: http
|
default: http
|
||||||
version_added: "2.1"
|
version_added: "2.1"
|
||||||
verify:
|
validate_certs:
|
||||||
description:
|
description:
|
||||||
- whether to verify the tls certificate of the consul agent
|
- whether to verify the tls certificate of the consul agent
|
||||||
required: false
|
required: false
|
||||||
|
@ -231,7 +231,7 @@ def get_consul_api(module, token=None):
|
||||||
return consul.Consul(host=module.params.get('host'),
|
return consul.Consul(host=module.params.get('host'),
|
||||||
port=module.params.get('port'),
|
port=module.params.get('port'),
|
||||||
scheme=module.params.get('scheme'),
|
scheme=module.params.get('scheme'),
|
||||||
verify=module.params.get('verify'),
|
validate_certs=module.params.get('validate_certs'),
|
||||||
token=module.params.get('token'))
|
token=module.params.get('token'))
|
||||||
|
|
||||||
def test_dependencies(module):
|
def test_dependencies(module):
|
||||||
|
@ -247,7 +247,7 @@ def main():
|
||||||
key=dict(required=True),
|
key=dict(required=True),
|
||||||
host=dict(default='localhost'),
|
host=dict(default='localhost'),
|
||||||
scheme=dict(required=False, default='http'),
|
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'),
|
port=dict(default=8500, type='int'),
|
||||||
recurse=dict(required=False, type='bool'),
|
recurse=dict(required=False, type='bool'),
|
||||||
retrieve=dict(required=False, default=True),
|
retrieve=dict(required=False, default=True),
|
||||||
|
|
|
@ -94,7 +94,7 @@ options:
|
||||||
required: false
|
required: false
|
||||||
default: http
|
default: http
|
||||||
version_added: "2.1"
|
version_added: "2.1"
|
||||||
verify:
|
validate_certs:
|
||||||
description:
|
description:
|
||||||
- whether to verify the tls certificate of the consul agent
|
- whether to verify the tls certificate of the consul agent
|
||||||
required: false
|
required: false
|
||||||
|
@ -252,7 +252,7 @@ def main():
|
||||||
host=dict(default='localhost'),
|
host=dict(default='localhost'),
|
||||||
port=dict(default=8500, type='int'),
|
port=dict(default=8500, type='int'),
|
||||||
scheme=dict(required=False, default='http'),
|
scheme=dict(required=False, default='http'),
|
||||||
verify=dict(required=False, default=True),
|
validate_certs=dict(required=False, default=True),
|
||||||
id=dict(required=False),
|
id=dict(required=False),
|
||||||
name=dict(required=False),
|
name=dict(required=False),
|
||||||
node=dict(required=False),
|
node=dict(required=False),
|
||||||
|
|
Loading…
Reference in a new issue