adjust consul playbook to be repeatable

Author: Bryan Kendall

ansible/beta-hosts/hosts

@@ -20,7 +20,7 @@ api
 [api]
 beta-api
 
-[consul-server]
+[consul]
 beta-services
 beta-api
 beta-web

ansible/consul.yml

@@ -1,8 +1,9 @@
 ---
 - hosts: consul
+  serial: 1
   vars_files:
     - group_vars/alpha-consul.yml
   roles:
   - { role: notify, tags: notify }
   - { role: database }
-  - { role: container_start, tags: deploy }
+  - { role: container_kill_start, tags: deploy }

ansible/group_vars/alpha-consul.yml

@@ -3,6 +3,9 @@ name: consul
 # for database role
 db_path: /etc/consul.d
 
+# for container_kill_start
+pause_length_minutes: 3
+
 container_image: progrium/consul
 container_tag: latest
 

ansible/roles/base_ubuntu/tasks/main.yml

@@ -12,7 +12,8 @@
   hostname: name="{{inventory_hostname}}--{{ansible_default_ipv4.address|replace(".", "-")}}"
   tags: "hostname"
 
-- lineinfile:
+- name: put hostname in /etc/hosts
+  lineinfile:
     dest=/etc/hosts
     regexp="127.0.0.1 {{inventory_hostname}}--{{ansible_default_ipv4.address|replace(".", "-")}}"
     line="127.0.0.1 {{inventory_hostname}}--{{ansible_default_ipv4.address|replace(".", "-")}}"

ansible/roles/container_kill_start/tasks/main.yml

@@ -10,19 +10,19 @@
   with_items: stopped_containers.stdout_lines
 
 # get current running container with this image
-- name: look for running containers running {{container_image}}
+- name: look for running containers running target image
   shell: "sudo docker ps | grep {{container_image}}: | awk '{print $1}'"
   register: old_containers_id
   changed_when: old_containers_id.stdout != ''
 
 # get latest image
 # tag will default to latest
-- name: pull down docker image {{container_image}}:{{container_tag}}
+- name: pull down target docker image
   command: sudo docker pull {{container_image}}:{{container_tag}}
   when: not do_not_push
 
 # get id of new image
-- name: get id of the docker image
+- name: get id of the target docker image
   shell: sudo docker images --no-trunc | grep {{container_image}}.*{{container_tag}} | awk '{print $3}'
   register: new_image_id
 
@@ -38,6 +38,10 @@
   command: sudo docker rm {{item}}
   with_items: old_containers_id.stdout_lines
 
+- name: pause to allow for any odd conditions in system caching tables
+  when: pause_length_minutes is defined and old_containers_id.changed
+  pause: minutes={{pause_length_minutes}}
+
 # start our new container with options and args
 - name: start container
   command: sudo docker run --log-driver=none -v /var/log:/var/log:rw --restart=always {{container_run_opts}} {{container_image}}:{{container_tag}} {{container_run_args}}