Skip to content

Commit

Permalink
Merge pull request #21 from dafyddj/latest_salt
Browse files Browse the repository at this point in the history
Bump vault/salt versions
  • Loading branch information
javierbertoli authored Oct 5, 2018
2 parents 4971c05 + df2d0ae commit 05c50f7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ verifier:

provisioner:
name: salt_solo
salt_install: bootstrap
salt_bootstrap_url: https://bootstrap.saltstack.com
salt_bootstrap_options: -p git -p curl stable 2016.11
salt_version: latest
log_level: debug
require_chef: false
Expand Down
7 changes: 7 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ To use it, just include *vault.server* in your *top.sls*, and configure it using
service:
type: systemd

Issues
======

Vault `v0.10.0 <https://github.com/hashicorp/vault/blob/master/CHANGELOG.md#0100-april-10th-2018>`_ introduces a revamped versioned kv backend (version 2), with a breaking change in the paths used to read/write data. This backend is enabled by default when dev mode is enabled.

The Salt execution modules are not compatible with this new backend, therefore if you intend to access Vault in dev mode using the Salt modules, it's suggested to use an outdated, but compatible version of Vault by setting a pillar value e.g. ``version: 0.9.6``.

Testing
=======

Expand Down
2 changes: 1 addition & 1 deletion test/integration/dev_server_systemd/vault_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
describe command('journalctl -u vault') do
its(:exit_status) { should eq 0 }
its(:stderr) { should be_empty }
its(:stdout) { should match(/WARNING: Dev mode is enabled!/) }
its(:stdout) { should match(/WARNING! dev mode is enabled!/) }
end

2 changes: 1 addition & 1 deletion test/integration/dev_server_upstart_s3/vault_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@

describe file('/var/log/vault.log') do
it { should be_a_file }
its(:content) { should match(/WARNING: Dev mode is enabled!/) }
its(:content) { should match(/WARNING! dev mode is enabled!/) }
end

3 changes: 1 addition & 2 deletions vault/defaults.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
vault:
version: 0.9.1
version: 0.11.2
listen_protocol: tcp
listen_port: 8200
listen_address: 0.0.0.0
tls_disable: 0
service: upstart
tls_cert_file: {}
tls_key_file: {}
default_lease_ttl: 24h
Expand Down

0 comments on commit 05c50f7

Please sign in to comment.