Merge pull request #171 from CodeNow/swarm-deamon

Swarm deamon

Author: rsandor

README.md

@@ -95,4 +95,8 @@ It is the custom at Runnable to play a song to the entire team when deploying. F
 
 [shiva: FFXIV Shiva Theme](https://www.youtube.com/watch?v=noJiH8HLZw4)
 
+[swarm-manager: Eric Prydz VS Pink Floyd - 'Proper Education'](https://www.youtube.com/watch?v=IttkDYE33aU)
+
+[swarm-deamon: Pink Floyd - Another Brick In The Wall](https://www.youtube.com/watch?v=5IpYOF4Hi6Q)
+
 **IMPORTANT:** Make sure the play the song loud and proud when deploying!

ansible/beta-hosts/variables

@@ -14,6 +14,9 @@ api_new_relic_app_name=beta-api-production
 api_rollbar_key=a90d9c262c7c48cfabbd32fd0a1bc61c
 api_s3_context_bucket=runnable.context.resources.production-beta
 
+[docks:vars]
+docker_config=docks
+
 [eru:vars]
 eru_github_id=8abb08f83f6d1c52bd1a
 eru_github_secret=74a23ee56486d57b14f292283cb04625f600917c

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

@@ -0,0 +1,16 @@
+name: "swarm-deamon"
+
+# container_kill_start settings
+container_image: swarm
+container_tag: 0.4.0
+
+# container_kill_start vars
+log_driver: json-file
+
+container_run_opts: >
+  -d
+
+container_run_args: >
+  join
+   --addr={{ ansible_default_ipv4.address }}:{{ docker_port }}
+  token://{{ swarm_token }}

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/prod-hosts/variables

@@ -14,6 +14,9 @@ api_new_relic_app_name=alpha-api-production
 api_rollbar_key=a90d9c262c7c48cfabbd32fd0a1bc61c
 api_s3_context_bucket=runnable.context.resources.production
 
+[docks:vars]
+docker_config=docks
+
 [eru:vars]
 eru_github_id=46a23f5f99f0aa9460f8
 eru_github_secret=a0336d72e3d540fb9fbbed2c123a81e1cb329dab

ansible/roles/container_kill_start/tasks/main.yml

@@ -1,46 +1,61 @@
 ---
-- name: look for stopped containers
-  shell: sudo docker ps -a | grep Exited | awk '{print $1}'
+- name: "look for stopped {{ container_image }} containers"
+  shell: >
+    sudo docker ps -a |
+    grep Exited |
+    grep {{ container_image }} |
+    awk '{print $1}'
   register: stopped_containers
   changed_when: stopped_containers.stdout != ''
 
-- name: removed stopped containers
+- name: "removed stopped {{ container_image }} containers"
   when: stopped_containers.changed
-  shell: sudo docker rm {{item}}
+  shell: sudo docker rm {{ item }}
   with_items: stopped_containers.stdout_lines
 
 # get current running container with this image
-- name: look for running containers running {{container_image}}
-  shell: "sudo docker ps | grep {{container_image}}: | awk '{print $1}'"
+- name: "look for running containers running {{ container_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}}
-  command: sudo docker pull {{container_image}}:{{container_tag}}
+- name: "pull down docker image {{ container_image }}:{{ container_tag }}"
+  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
-  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
 - name: stop old containers
   when: old_containers_id.changed
-  command: sudo docker stop -t {{stop_time}} {{item}}
+  command: sudo docker stop -t {{ stop_time }} {{ item }}
   with_items: old_containers_id.stdout_lines
 
 # remove the old containers that were running previously
 - name: remove old containers
   when: old_containers_id.changed
-  command: sudo docker rm {{item}}
+  command: sudo docker rm {{ item }}
   with_items: old_containers_id.stdout_lines
 
 # 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

ansible/roles/docker/templates/docks

@@ -1,5 +1,6 @@
-DOCKER_OPTS="-H=unix:///var/run/docker.sock -H=0.0.0.0:4242"
-DOCKER_OPTS="$DOCKER_OPTS --tlsverify --tlscacert=/etc/ssl/docker/ca.pem"
-DOCKER_OPTS="$DOCKER_OPTS --tlscert=/etc/ssl/docker/cert.pem --tlskey=/etc/ssl/docker/key.pem"
+DOCKER_OPTS="-H=unix:///var/run/docker.sock -H=0.0.0.0:{{ docker_port }}"
+DOCKER_OPTS="$DOCKER_OPTS --tlsverify --tlscacert={{ docker_ca_path }}"
+DOCKER_OPTS="$DOCKER_OPTS --tlscert={{ docker_cert_path }} --tlskey={{ docker_key_path }}"
 DOCKER_OPTS="$DOCKER_OPTS -g /docker --insecure-registry registry.runnable.com --icc=false"
-DOCKER_OPTS="$DOCKER_OPTS --dns={{ charon_host | default(hostvars[groups['charon'][0]]['ansible_default_ipv4']['address'])}} --dns=8.8.8.8"
+DOCKER_OPTS="$DOCKER_OPTS --bip 172.17.42.1/16"
+DOCKER_OPTS="$DOCKER_OPTS --dns=172.17.42.1 --dns=8.8.8.8"