From c92b11f6096b7702c7831c01cbdca8269df6daab Mon Sep 17 00:00:00 2001 From: Andreas Tsarida Date: Mon, 23 May 2016 14:42:21 +0200 Subject: [PATCH 1/2] remove duplicate values --- defaults/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index bac4794..fa1bd60 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -105,7 +105,3 @@ consul_statsite_enabled: false consul_statsite_addr: http://somesite consul_syslog_facility: LOCAL0 - -consul_verify_incoming: '{{json_true}}' - -consul_verify_outgoing: '{{json_true}}' From 36905608c0ead089ae51b076f1743b0be1c7d359 Mon Sep 17 00:00:00 2001 From: Andreas Tsarida Date: Mon, 23 May 2016 15:26:35 +0200 Subject: [PATCH 2/2] copy certificates if consul_connection_verify_enabled --- tasks/configure.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/configure.yml b/tasks/configure.yml index 8ff9868..6f9f6a3 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -4,6 +4,7 @@ - {name: 'consul_ca.crt', dest: '{{consul_ca_file}}'} - {name: 'consul.crt', dest: '{{consul_cert_file}}'} - {name: 'consul.key', dest: '{{consul_key_file}}'} + when: consul_connection_verify_enabled - name: add common configuration template: src={{item}} dest={{consul_conf_dir}}/{{item}}