Skip to content

Commit

Permalink
Consul 1.2.2 and more
Browse files Browse the repository at this point in the history
- 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)
- Fix generate `consul_acl_master_token` when not provided (thanks @abarbare)
- Update CONTRIBUTORS
  • Loading branch information
brianshumate committed Aug 10, 2018
1 parent 870d29a commit 70e84ce
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 10 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 3 additions & 2 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <at> brianshumate <dot> com` and
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/README_VAGRANT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.0.3
v2.0.4

0 comments on commit 70e84ce

Please sign in to comment.