Skip to content

Commit

Permalink
Consul v1.0.1 and more
Browse files Browse the repository at this point in the history
  • Loading branch information
brianshumate committed Dec 1, 2017
1 parent 5bd1b01 commit 3564759
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -754,8 +754,11 @@ Actually add new template files :facepalm:

- Remove deprecated advertise_addrs to resolve #123 so that role works again

## v1.29.0 (UNRELEASED)
## v1.29.0

- Consul v1.0.1
- Fix idempotency (thanks @issmirnov)
- Make gossip encryption optional (thanks @hwmrocker)
- Install netaddr with `--user`
- Update documentation
- Update CONTRIBUTORS
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ This role requires FreeBSD, or a Debian or RHEL based Linux distribution or
Windows Server 2012 R2. It might work with other software versions, but does
definitely work with the following specific software and versions:

* Consul: 1.0.0
* Consul: 1.0.1
* Ansible: 2.3.2.0
* CentOS: 7
* Debian: 8
Expand All @@ -58,7 +58,7 @@ the variables are named and described below:
### `consul_version`

- Version to install
- Default value: *1.0.0*
- Default value: *1.0.1*

### `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 @@ -5,7 +5,7 @@
consul_debug: no

### Package
consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.0.0', true) }}"
consul_version: "{{ lookup('env','CONSUL_VERSION') | default('1.0.1', 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 @@ -107,7 +107,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.0.0
* Consul version 1.0.1
* Ansible: 2.3.2.0
* VirtualBox version 5.1.28
* Vagrant version 2.0.0
Expand Down
8 changes: 2 additions & 6 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
---
# File: main.yml - Main tasks for Consul
#
# Unfortunately, this playbook violates DRY somewhat to handle installation
# on both non-Windows and Windows systems due to such bad words as casting
# dicts, and being so over YAML that this stuff just needs to get pitched
# into the rubbish bin at some point in the immediate future :lol:

- name: Install netaddr dependency locally
- name: Install netaddr dependency on controlling host as user
pip:
name: netaddr
extra_args: --user
delegate_to: 127.0.0.1
become: false

Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.28.1
v1.29.0

0 comments on commit 3564759

Please sign in to comment.