From b5390824c25912f8909345710ef6aa5ce7b7081f Mon Sep 17 00:00:00 2001 From: Chris Tooley Date: Sat, 5 Mar 2016 00:37:41 +0000 Subject: Add https support for consul clustering modules --- clustering/consul_session.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'clustering/consul_session.py') diff --git a/clustering/consul_session.py b/clustering/consul_session.py index c298ea7f..23d683e8 100644 --- a/clustering/consul_session.py +++ b/clustering/consul_session.py @@ -88,6 +88,16 @@ options: - the port on which the consul agent is running required: false default: 8500 + scheme: + description: + - the protocol scheme on which the consul agent is running + required: false + default: http + verify: + description: + - whether to verify the tls certificate of the consul agent + required: false + default: True """ EXAMPLES = ''' @@ -244,6 +254,8 @@ def main(): delay=dict(required=False,type='str', default='15s'), host=dict(default='localhost'), port=dict(default=8500, type='int'), + scheme=dict(required=False, default='http'), + verify=dict(required=False, default=True), id=dict(required=False), name=dict(required=False), node=dict(required=False), -- cgit v1.2.1 From 516f7d98e755e1cbec7daf2e3370d0e6f1354f04 Mon Sep 17 00:00:00 2001 From: Chris Tooley Date: Sat, 5 Mar 2016 00:55:08 +0000 Subject: Add version_added to documentation --- clustering/consul_session.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'clustering/consul_session.py') diff --git a/clustering/consul_session.py b/clustering/consul_session.py index 23d683e8..625c31c7 100644 --- a/clustering/consul_session.py +++ b/clustering/consul_session.py @@ -93,11 +93,13 @@ options: - the protocol scheme on which the consul agent is running required: false default: http + version_added: "2.1" verify: description: - whether to verify the tls certificate of the consul agent required: false default: True + version_added: "2.1" """ EXAMPLES = ''' -- cgit v1.2.1 From 04982da9b8bea61c84a1a0b43f12bed85a720919 Mon Sep 17 00:00:00 2001 From: Chris Tooley Date: Wed, 23 Mar 2016 13:23:30 +0000 Subject: Modify consul certificate validation bypass keyword from 'verify' to 'validate_certs' --- clustering/consul_session.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clustering/consul_session.py') diff --git a/clustering/consul_session.py b/clustering/consul_session.py index 625c31c7..3ba3b6f1 100644 --- a/clustering/consul_session.py +++ b/clustering/consul_session.py @@ -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), -- cgit v1.2.1