Merge branch 'devel'

ansible-community · Feb 24, 2017 · 4c86c0f · 4c86c0f
2 parents 36833a9 + f0c08be
commit 4c86c0f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -102,3 +102,8 @@
 - Fix issue in wait_for (thanks @pierrefh)
 - Add contributing guidelines in CONTRIBUTING.md
 - Fix checksum var
+
+## v1.2.9
+
+- Fix backend template inclusion
+- Correct backend filename
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -25,4 +25,4 @@ vault_port: "8200"
 vault_node_name: "{{ inventory_hostname_short }}"
 vault_main_config: "{{ vault_config_path }}/vault_main.hcl"
 vault_primary_node: "{{hostvars[groups['primary'][0]]['ansible_fqdn']}}"
-vault_backend: "consul"
+vault_backend: "backend_consul.j2"
diff --git a/templates/vault_main.hcl.j2 b/templates/vault_main.hcl.j2
@@ -1,4 +1,4 @@
-{% include backend_{{ vault_backend }}.j2 with context %}
+{% include vault_backend with context %}
 
 cluster_name = "sutakku"
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.2.8
+v1.2.9