Skip to content

Commit

Permalink
Consul v1.3.1 and more
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
brianshumate committed Nov 14, 2018
1 parent e11ba27 commit 4bac996
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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
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.3.0
* Consul: 1.3.1
* Ansible: 2.6.4
* Alpine Linux: 3.8
* CentOS: 7
Expand Down Expand Up @@ -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`

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: 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)
Expand Down
4 changes: 2 additions & 2 deletions examples/README_VAGRANT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions tests/test_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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\
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.1.0
v2.1.1

0 comments on commit 4bac996

Please sign in to comment.