From 4bac99695b84f74f35557542fa7dec4289c57aad Mon Sep 17 00:00:00 2001
From: Brian Shumate <brian@brianshumate.com>
Date: Wed, 14 Nov 2018 10:06:24 -0500
Subject: [PATCH] Consul v1.3.1 and more

- Consul v1.3.1
- Configuration and documentation for gRPC (thanks @RavisMsk)
- Consistent boolean use
- Fix Consul restart handler reference (thanks @blaet)
- Write gossip key on all hosts (thanks @danielkucera)
- Protect local consul cluster key file (thanks @blaet)
- Support Amazon Linux (thanks @soloradish)
- Quite ACL replication token retrieval (thanks @jpiron)
- disable_keyring_file configuration option (thanks @vincepii)
- Update tests
- Update documentation
---
 CHANGELOG.md               |  6 +++---
 README.md                  |  4 ++--
 defaults/main.yml          |  2 +-
 examples/README_VAGRANT.md |  4 ++--
 tests/test_vars.yml        | 16 ++++++++--------
 version.txt                |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d04fff0c..eaf4d7f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
-## v2.1.1 (UNRELEASED)
+## v2.1.1
 
-- Consul v1.4.0
+- Consul v1.3.1
 - Configuration and documentation for gRPC (thanks @RavisMsk)
 - Consistent boolean use
 - Fix Consul restart handler reference (thanks @blaet)
@@ -9,7 +9,7 @@
 - Support Amazon Linux (thanks @soloradish)
 - Quite ACL replication token retrieval (thanks @jpiron)
 - disable_keyring_file configuration option (thanks @vincepii)
-
+- Update tests
 - Update documentation
 
 ## v2.1.0
diff --git a/README.md b/README.md
index 06b50a0e..275bc83f 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ This role requires a FreeBSD, Debian, or RHEL based Linux distribution or
 Windows Server 2012 R2. It might work with other software versions, but is
 definitely known to work with the following specific software versions:
 
-* Consul: 1.3.0
+* Consul: 1.3.1
 * Ansible: 2.6.4
 * Alpine Linux: 3.8
 * CentOS: 7
@@ -59,7 +59,7 @@ the variables are named and described below:
 ### `consul_version`
 
 - Version to install
-- Default value: *1.3.0*
+- Default value: *1.3.1*
 
 ### `consul_architecture_map`
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 1d5cfecc..fb2aaab3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,7 +7,7 @@ is_virtualenv: "{{ lookup('env','VIRTUAL_ENV') | default('', true) }}"
 consul_install_dependencies: true
 
 ### Package
-consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.3.0', true) }}"
+consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.3.1', true) }}"
 consul_architecture_map:
   # this first entry seems redundant
   # (but it's required for reasons)
diff --git a/examples/README_VAGRANT.md b/examples/README_VAGRANT.md
index 90abcaf9..87320334 100644
--- a/examples/README_VAGRANT.md
+++ b/examples/README_VAGRANT.md
@@ -90,9 +90,9 @@ BOX_NAME=freebsd/FreeBSD-11.0-STABLE CONSUL_IFACE=em1 vagrant up
 ## Notes
 
 1. This project functions with the following software versions:
-  * Consul version 1.3.0
+  * Consul version 1.3.1
   * Ansible: 2.6.4
-  * VirtualBox version 5.2.18
+  * VirtualBox version 5.2.22
   * Vagrant version 2.1.5
   * Vagrant Hosts plugin version 2.8.1
 2. This project uses Debian 9 (Stretch) by default, but you can choose another OS distribution with the *BOX_NAME* environment variable
diff --git a/tests/test_vars.yml b/tests/test_vars.yml
index 6d83a5e5..8c66c10c 100644
--- a/tests/test_vars.yml
+++ b/tests/test_vars.yml
@@ -4,7 +4,7 @@ ansible_default_ipv4:
   interface: eth0
 ansible_eth0:
   ipv4:
-     address: "1.1.1.1"
+    address: "1.1.1.1"
 ansible_system: ubuntu
 consul_raw_key: consul_raw_key
 _consul_lan_servers:
@@ -17,11 +17,11 @@ item:
   config_version: bootstrap
 
 ## Core
-consul_debug: no
+consul_debug: false
 is_virtualenv: "{{ lookup('env','VIRTUAL_ENV') | default('', true) }}"
 
 ### Package
-consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.3.0', true) }}"
+consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.3.1', true) }}"
 consul_architecture_map:
   # this first entry seems redundant
   # (but it's required for reasons)
@@ -58,9 +58,9 @@ consul_run_path: "/var/run/consul"
 consul_binary: "{{ consul_bin_path }}/consul"
 
 ### System user and group
-consul_manage_user: yes
+consul_manage_user: true
 consul_user: "consul"
-consul_manage_group: no
+consul_manage_group: false
 consul_group: "bin"
 
 ### Consul settings
@@ -81,8 +81,8 @@ consul_node_role: "{{ lookup('env','CONSUL_NODE_ROLE') | default('client', true)
 consul_recursors: "{{ lookup('env','CONSUL_RECURSORS') | default('[]', true) }}"
 consul_bootstrap_expect: "{{ lookup('env','CONSUL_BOOTSTRAP_EXPECT') | default(false, true) }}"
 consul_ui: "{{ lookup('env', 'CONSUL_UI') | default(true, true) }}"
-consul_disable_update_check: no
-consul_enable_script_checks: no
+consul_disable_update_check: false
+consul_enable_script_checks: false
 consul_raft_protocol: "\
   {% if consul_version is version_compare('0.7.0', '<=') %}\
     1\
@@ -141,7 +141,7 @@ consul_servers: "\
     {% endif %}\
   {% endfor %}\
   {{ _consul_servers }}"
-consul_gather_server_facts: no
+consul_gather_server_facts: false
 
 ## ACL
 consul_acl_policy: false
diff --git a/version.txt b/version.txt
index 852700e1..76b426fd 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v2.1.0
\ No newline at end of file
+v2.1.1
\ No newline at end of file