Merge pull request #4 from stackhpc/missing-vars

Document all mandatory variables, rename vault_vip_url to vault_vip_address

Author: markgoddard

roles/vault/README.md

@@ -18,8 +18,11 @@ Role variables
 * Vault
   * Mandatory
     * `vault_cluster_name`: Vault cluster name (e.g. "prod_cluster")
+    * `vault_bind_address`: Which IP address should Vault bind to
+    * `vault_vip_address`: Under which IP address Vault should be available (this role does not deploy keepalived)
     * `vault_tls_key`: Path to TLS key to use by Vault
     * `vault_tls_cert`: Path to TLS cert to use by Vault
+    * `vault_config_dir`: Directory into which to bind mount Vault configuration
   * Optional
     * `consul_container.etc_hosts`: Dict; `{<hostname>:<ip_address>}` to be added to container /etc/host
 s (default: Omitted)
@@ -70,7 +73,7 @@ Example playbook (used with OpenStack Kayobe)
       consul_bind_ip: "{{ internal_net_ips[ansible_hostname] }}"
       consul_vip_address: "{{ internal_net_vip_address }}"
       vault_bind_address: "{{ external_net_ips[ansible_hostname] }}"
-      vault_vip_url: "{{ external_net_fqdn }}"
+      vault_vip_address: "{{ external_net_fqdn }}"
       vault_config_dir: "/opt/kayobe/vault"
 ```
 

roles/vault/defaults/main.yml

@@ -9,9 +9,14 @@ vault_docker_image: "vault"
 vault_docker_tag: "latest"
 
 vault_cluster_name: ""
+# Allow vault_vip_url for backwards compatibility.
+vault_vip_address: "{{ vault_vip_url | default('') }}"
+vault_bind_address: ""
 vault_tls_key: ""
 vault_tls_cert: ""
 
+vault_config_dir: ""
+
 vault_config: >
   {
     "cluster_name": "{{ vault_cluster_name }}",

roles/vault/tasks/vault.yml

@@ -17,14 +17,14 @@
 
 - name: Check if vault is initialized
   uri:
-    url: "https://{{ vault_vip_url }}:8200/v1/sys/init"
+    url: "https://{{ vault_vip_address }}:8200/v1/sys/init"
   register: vault_init_status
   retries: 50
   delay: 1
   until: vault_init_status.status == 200
 
 - name: Initialize vault
-  command: "docker exec -e 'VAULT_ADDR=https://{{ vault_vip_url }}:8200' {{ vault_docker_name }} vault operator init -format yaml"
+  command: "docker exec -e 'VAULT_ADDR=https://{{ vault_vip_address }}:8200' {{ vault_docker_name }} vault operator init -format yaml"
   when: not vault_init_status.json.initialized
   run_once: True
   register: vault_init_output