Merge branch 'devel'

CHANGELOG.md

@@ -101,3 +101,4 @@
 
 - Fix issue in wait_for (thanks @pierrefh)
 - Add contributing guidelines in CONTRIBUTING.md
+- Fix checksum var

README.md

@@ -47,6 +47,7 @@ The role defines variables in `defaults/main.yml`:
 | `vault_main_config` | `{{ vault_config_path }}/vault_main.hcl` | Main configuration file path |
 | `vault_consul` | `127.0.0.1:8500` | Address of Consul backend |
 | `vault_consul_path` | `vault` | Consul path to use |
+| `vault_backend` | `backend_consul.j2` | Backend template filename |
 
 ### OS Distribution Variables
 
@@ -95,6 +96,16 @@ You can also pass variables in using the `--extra-vars` option to the
 ansible-playbook -i hosts site.yml --extra-vars "vault_datacenter=maui"
 ```
 
+Specify a template file with a different backend definition
+(see `templates/backend_consul.j2`):
+
+```
+ansible-playbook -i hosts site.yml --extra-vars "vault_backed=backend_file.j2"
+```
+
+You need to make sure that the template file `backend_file.j2` is in the
+role directory for this to work.
+
 ### Vagrant and VirtualBox
 
 See `examples/README_VAGRANT.md` for details on quick Vagrant deployments

defaults/main.yml

@@ -24,4 +24,5 @@ vault_address: "0.0.0.0"
 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_primary_node: "{{hostvars[groups['primary'][0]]['ansible_fqdn']}}"
+vault_backend: "consul"

tasks/install.yml

@@ -47,7 +47,8 @@
   connection: local
   get_url:
     url: "{{ vault_zip_url }}"
-    dest: "{{ role_path }}/files/{{ vault_pkg }} checksum=sha256:{{ vault_sha256.stdout.split(' ')|first }}"
+    dest: "{{ role_path }}/files/{{ vault_pkg }}"
+    checksum: "sha256:{{ vault_sha256.stdout.split(' ')|first }}"
     timeout: 42
   run_once: true
   tags: installation

tasks/main.yml

@@ -22,10 +22,12 @@
   when: ansible_distribution == "Ubuntu" and ansible_distribution_version|version_compare(13.04, '<')
 
 - name: Create cluster groupings
-  group_by: "key=os_{{ ansible_os_family }}"
+  group_by:
+    key: "os_{{ ansible_os_family }}"
 
 - name: Create cluster groupings
-  group_by: "key={{ vault_node_role }}"
+  group_by:
+    key: "{{ vault_node_role }}"
 
 - name: "Add Vault user"
   user:

templates/backend_consul.j2

@@ -0,0 +1,6 @@
+backend "consul" {
+  address = "127.0.0.1:8500"
+  redirect_addr = "http://{{ vault_address }}:{{ vault_port }}"
+  cluster_addr = "http://{{ vault_primary_node }}:{{ vault_port }}/"
+  path = "vault"
+}

templates/vault_main.hcl.j2

@@ -1,9 +1,4 @@
-backend "consul" {
-  address = "127.0.0.1:8500"
-  redirect_addr = "http://{{ vault_address }}:{{ vault_port }}"
-  cluster_addr = "http://{{ vault_primary_node }}:{{ vault_port }}/"
-  path = "vault"
-}
+{% include backend_{{ vault_backend }}.j2 with context %}
 
 cluster_name = "sutakku"