Skip to content

Commit

Permalink
Consul v1.1.0 and more
Browse files Browse the repository at this point in the history
  • Loading branch information
brianshumate committed Jun 5, 2018
1 parent 24bec50 commit 62fc745
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 12 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
## v1.60.1 (UNRELEASED)
## v2.0.0

- Consul v1.1.0
- Update configuration directory permissions (thanks @Rtzq0)
- Update service script dependency (thanks @mattburgess)
- Assert if consul_group_name missing from groups (thanks @suzuki-shunsuke)
- Change syslog user to root (no syslog user on Debian/dir task fails)
- Updated CHANGELOG ordering 🎉
- Update documentation

## v1.60.0

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ 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.0.7
* Ansible: 2.5
* Consul: 1.1.0
* Ansible: 2.5.4
* CentOS: 7
* Debian: 9
* FreeBSD: 11
Expand All @@ -52,7 +52,7 @@ the variables are named and described below:
### `consul_version`

- Version to install
- Default value: *1.0.7*
- Default value: *1.1.0*

### `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 @@ -6,7 +6,7 @@ consul_debug: no
is_virtualenv: "{{ lookup('env','VIRTUAL_ENV') | default('', true) }}"

### Package
consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.0.7', true) }}"
consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.1.0', true) }}"
consul_architecture_map:
# this first entry seems redundant
# (but it's required for reasons)
Expand Down
10 changes: 5 additions & 5 deletions examples/README_VAGRANT.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ 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.0.7
* Ansible: 2.5.0
* VirtualBox version 5.2.10
* Vagrant version 2.0.3
* Vagrant Hosts plugin version 2.8.0
* Consul version 1.1.0
* Ansible: 2.5.4
* VirtualBox version 5.2.12
* Vagrant version 2.1.1
* 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
3. The `bin/preinstall` shell script performs the following actions for you:
* Adds each node's host information to the host machine's `/etc/hosts`
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.0.7', true) }}"
consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.1.0', 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 @@
v1.60.0
v2.0.0

0 comments on commit 62fc745

Please sign in to comment.