diff --git a/CHANGELOG.md b/CHANGELOG.md index c15d7c73..ac08f62a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ -## v2.0.4 (UNRELEASED) +## v2.0.4 +- Consul 1.2.2 - Update remaining deprecated tests (thanks @viruzzo) +- Added handler to reload configuration on Linux (thanks @viruzzo) - Add support for Oracle Linux (thanks @TheLastChosenOne) -- Update CONTRIBBUTORS +- Fix generate `consul_acl_master_token` when not provided (thanks @abarbare) +- Update CONTRIBUTORS ## v2.0.3 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index e985804b..919d2182 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -40,8 +40,9 @@ Thank you to all these fine folks for helping with ansible-consul! - [@soloradish](https://github.com/soloradish) - [@coughlanio)](https://github.com/coughlanio) - [@Logan2211](https://github.com/Logan2211) -- [viruzzo](https://github.com/viruzzo) -- [TheLastChosenOne](https://github.com/TheLastChosenOne) +- [@viruzzo](https://github.com/viruzzo) +- [@TheLastChosenOne](https://github.com/TheLastChosenOne) +- [@abarbare](https://github.com/abarbare) If you have contributed but do not appear here, please fear not and accept apologies for the omission. Contact `brian brianshumate com` and diff --git a/README.md b/README.md index fd2f0e53..6db6b3bb 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.2.0 +* Consul: 1.2.2 * Ansible: 2.6.1 * CentOS: 7 * Debian: 9 @@ -53,7 +53,7 @@ the variables are named and described below: ### `consul_version` - Version to install -- Default value: *1.2.0* +- Default value: *1.2.2* ### `consul_architecture_map` diff --git a/defaults/main.yml b/defaults/main.yml index da722124..3d069b0e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -7,7 +7,7 @@ is_virtualenv: "{{ lookup('env','VIRTUAL_ENV') | default('', true) }}" consul_install_dependencies: yes ### Package -consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.2.0', true) }}" +consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.2.2', 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 3813b874..70def6be 100644 --- a/examples/README_VAGRANT.md +++ b/examples/README_VAGRANT.md @@ -90,7 +90,7 @@ 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.2.0 + * Consul version 1.2.2 * Ansible: 2.6.1 * VirtualBox version 5.2.12 * Vagrant version 2.1.2 diff --git a/tests/test_vars.yml b/tests/test_vars.yml index c2623038..94058ef2 100644 --- a/tests/test_vars.yml +++ b/tests/test_vars.yml @@ -21,7 +21,7 @@ consul_debug: no is_virtualenv: "{{ lookup('env','VIRTUAL_ENV') | default('', true) }}" ### Package -consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.2.0', true) }}" +consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.2.2', true) }}" consul_architecture_map: # this first entry seems redundant # (but it's required for reasons) diff --git a/version.txt b/version.txt index 201271f0..7059afe1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v2.0.3 \ No newline at end of file +v2.0.4 \ No newline at end of file