add restart policy var, cleanup kill_start

Author: anandkumarpatel

ansible/group_vars/alpha-hubot.yml

@@ -13,7 +13,6 @@ container_run_opts: >
   -v /home/ubuntu/.ssh/config:/root/.ssh/config
   -v /home/ubuntu/.ssh/Test-runnable.pem:/root/.ssh/Test-runnable.pem
   -v /home/ubuntu/.ssh/oregon.pem:/root/.ssh/oregon.pem
-  --restart=always
   -p 0.0.0.0:80:80
 
 # container_kill_start

ansible/group_vars/alpha-palantiri.yml

@@ -25,6 +25,5 @@ container_envs: >
 
 container_run_opts: >
   -d
-  --restart=always
   -v /opt/ssl/docker/{{ name }}:/etc/ssl/docker:ro
   {{ container_envs }}

ansible/group_vars/alpha-swarm-deamon.yml

@@ -9,7 +9,6 @@ log_driver: json-file
 
 container_run_opts: >
   -d
-  --restart=always
 
 container_run_args: >
   join

ansible/group_vars/alpha-swarm-manager.yml

@@ -11,7 +11,6 @@ container_run_opts: >
   -d
   -p {{ swarm_master_port }}:2375
   -v /opt/ssl/docker/{{ name }}:/etc/ssl/docker:ro
-  --restart=always
 
 container_run_args: >
   manage

ansible/group_vars/alpha-workers.yml

@@ -57,5 +57,4 @@ container_envs: >
 container_run_opts: >
   -d
   -v /opt/ssl/docker/{{ name }}:/etc/ssl/docker:ro
-  --restart=always
   {{ container_envs }}

ansible/roles/container_kill_start/tasks/main.yml

@@ -1,6 +1,10 @@
 ---
 - name: "look for stopped {{ container_image }} containers"
-  shell: sudo docker ps -a | grep Exited | grep {{ container_image }} | awk '{print $1}'
+  shell: >
+    sudo docker ps -a |
+    grep Exited |
+    grep {{ container_image }} |
+    awk '{print $1}'
   register: stopped_containers
   changed_when: stopped_containers.stdout != ''
 
@@ -23,7 +27,11 @@
 
 # get id of new image
 - name: get id of the docker image
-  shell: sudo docker images --no-trunc | grep {{ container_image }}.*{{ container_tag }} | awk '{print $3}'
+  shell: >
+    sudo docker images
+    --no-trunc |
+    grep {{ container_image }}.*{{ container_tag }} |
+    awk '{print $3}'
   register: new_image_id
 
 # stop the old containers that were running this previously
@@ -40,7 +48,14 @@
 
 # start our new container with options and args
 - name: start container
-  command: sudo docker run --log-driver={{ log_driver | default("none")}} -v /var/log:/var/log:rw --restart=always {{ container_run_opts}} {{ container_image }}:{{ container_tag }} {{ container_run_args }}
+  command: >
+    sudo docker run
+    --log-driver={{ log_driver | default("none")}}
+    -v /var/log:/var/log:rw
+    --restart={{ restart_policy | default('always') }}
+    {{ container_run_opts}}
+    {{ container_image }}:{{ container_tag }}
+    {{ container_run_args }}
   register: new_container_id
   notify:
     - get new container ports