From aaed105ab761839b0ff23b4430bcc56eb2ca7122 Mon Sep 17 00:00:00 2001 From: James Kafader Date: Thu, 6 Apr 2017 14:51:51 -0700 Subject: [PATCH] added variable to turn on debugging, for future use, mostly. Moved dnsmasq/iptables out of 'bootstrapped' tasks, because that kind of decreases their utility. --- defaults/main.yml | 3 +++ tasks/main.yml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c4616529..19775e88 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -64,3 +64,6 @@ consul_iptables_enable: true ### Consul consul_pkg: "consul_{{ consul_version }}_linux_amd64.zip" + +### Print Debug Messages +consul_debug: false diff --git a/tasks/main.yml b/tasks/main.yml index 2860084f..63da7120 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -80,6 +80,15 @@ - /etc/consul.d/server #- include: ../tasks/encrypt_gossip.yml +- debug: + msg: "consul_iptables_enable: {{ consul_iptables_enable }}" + when: consul_debug + +- include: ../tasks/iptables.yml + when: consul_iptables_enable + +- include: ../tasks/dnsmasq.yml + when: consul_dnsmasq_enable - name: Bootstrap configuration template: @@ -154,15 +163,6 @@ dest: /etc/consul/.consul_bootstrapped state: touch - - include: ../tasks/dnsmasq.yml - when: consul_dnsmasq_enable - - - debug: - msg: "consul_iptables_enable: {{ consul_iptables_enable }}" - - - include: ../tasks/iptables.yml - when: consul_iptables_enable - - include: ../tasks/client.yml when: consul_node_role == "client" and ansible_os_family == "Debian"