Merge pull request #209 from CodeNow/fix-consul-and-vault

fix consul and vault images and commands

Author: rsandor

ansible/group_vars/alpha-consul.yml

@@ -6,14 +6,15 @@ db_path: /etc/consul.d
 # for container_kill_start
 pause_length_minutes: 3
 
-container_image: progrium/consul
-container_tag: latest
+container_image: runnable/consul
+container_tag: v0.5.2
 
 container_run_opts: >
   -d
   -h {{ inventory_hostname }}
   -v /consul:/data
   -v /etc/consul.d:/etc/consul.d:ro
+  -v /var/log:/var/log
   -p {{ ansible_default_ipv4.address }}:8300:8300
   -p {{ ansible_default_ipv4.address }}:8301:8301
   -p {{ ansible_default_ipv4.address }}:8301:8301/udp
@@ -24,14 +25,18 @@ container_run_opts: >
   --restart=always
 
 container_run_args: >
+  consul agent
   -server
   -node {{ inventory_hostname }}
   -advertise {{ ansible_default_ipv4.address }}
   -config-dir /etc/consul.d
+  -client 0.0.0.0
+  -recursor 8.8.8.8
   {% if hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] == ansible_default_ipv4.address %}-bootstrap-expect {{ groups['consul'] | length }}{% endif %}
   -data-dir /data
   {% if hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] == ansible_default_ipv4.address %}-ui-dir /ui{% endif %}
   {% if hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] != ansible_default_ipv4.address %}-retry-join {{ hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] }}{% endif %}
+  > /var/log/consul.log 2>&1
 
 # some seed values
 # pulled 2015/16/11 - Bryan

ansible/group_vars/alpha-vault.yml

@@ -10,11 +10,13 @@ container_run_opts: >
   -d
   -h {{ inventory_hostname }}
   -v /opt/runnable/vault/vault.hcl:/vault.hcl:ro
+  -v /var/log:/var/log:rw
   -p {{ ansible_default_ipv4.address }}:8200:8200
   --cap-add IPC_LOCK
   --restart=always
 
 container_run_args: >
-  server
+  vault server
   -log-level=warn
   -config=/vault.hcl
+  > /var/log/vault.log 2>&1