Skip to content

Commit

Permalink
Enterprise tasks and variable updates
Browse files Browse the repository at this point in the history
- Enable Vault Enterprise tasks
- Remove `redirect_addr` in favor of request forwarding
- Make `vault_log_level` environment variable override
- Update documentation
  • Loading branch information
brianshumate committed May 31, 2017
1 parent c11b575 commit df9e070
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,3 +272,6 @@
## v1.6.4 (UNRELEASED)

- Enable Vault Enterprise tasks
- Remove `redirect_addr` in favor of request forwarding
- Make `vault_log_level` environment variable override
- Update documentation
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ might work with other software versions, but does work with the following
specific software and versions:

* Ansible: 2.3.0.0
* Vault: 0.7.0
* Vault: 0.7.2
* Debian: 8
* FreeBSD 11
* Ubuntu 16.04
Expand All @@ -35,7 +35,7 @@ The role defines variables in `defaults/main.yml`:

- version to install
- Can be overridden with `VAULT_VERSION` environment variable
- Default value: *0.7.0*
- Default value: *0.7.2*

### `vault_enterprise`

Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ vault_cluster_name: dc1
vault_datacenter: dc1
vault_consul: 127.0.0.1:8500
vault_consul_path: vault
vault_log_level: info
vault_log_level: "{{ lookup('env','VAULT_LOG_LEVEL') | default('info', true) }}"
vault_syslog_enable: true
vault_iface: "{{ lookup('env','VAULT_IFACE') | default('eth1', true) }}"
vault_address: "0.0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/README_VAGRANT.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ variable.
## Notes

1. This project functions with the following software versions:
* Vault version 0.7.0
* Vault version 0.7.2
* Ansible: 2.3.0.0
* VirtualBox version 5.1.20
* Vagrant version 1.9.4
Expand Down
1 change: 0 additions & 1 deletion templates/vault_backend_consul.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ backend "consul" {
address = "{{ vault_consul }}"
datacenter = "{{ vault_datacenter }}"
path = "vault"
redirect_addr = "http://{{ vault_redirect_addr }}:{{ vault_port }}"
cluster_addr = "http://{{ vault_cluster_address }}:{{ _vault_plus_one_port }}"
disable_clustering = "{{ vault_cluster_disable }}"
}
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.6.3
v1.6.4

0 comments on commit df9e070

Please sign in to comment.