Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
brianshumate committed Feb 16, 2017
2 parents 08a68f6 + de45c8b commit b48e364
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,3 +338,7 @@
- Consul 0.7.5
- Update documentation
- Contributors correction

## v1.8.2

- Update Consul bin path in keygen task
3 changes: 2 additions & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,10 @@

- block:
- name: Generate gossip encryption key
shell: "PATH=/usr/local/bin:$PATH consul keygen"
shell: "PATH={{ consul_bin_path }}:$PATH consul keygen"
register: consul_keygen
run_once: true

- name: Save encryption key
set_fact: consul_raw_key={{ consul_keygen.stdout }}
when: consul_raw_key is not defined and not bootstrap_marker.stat.exists
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
v1.8.1
v1.8.2

0 comments on commit b48e364

Please sign in to comment.