Merge remote-tracking branch 'origin/master' into remove-shrinkwrap-from-api

# Conflicts:
#	ansible/roles/docker/tasks/main.yml

Author: Myztiq

ansible/group_vars/all.yml

@@ -32,6 +32,7 @@ loggly_username: ops
 ## cores and logs
 ##
 
+app_log_dir: /var/log
 core_file_dir: /var/log/core
 
 ##

ansible/group_vars/alpha-khronos.yml

@@ -8,20 +8,23 @@ npm_version: 2
 
 # for cron job
 # this is the list of queues we want to enqueue a job into
-cron_queues: khronos:containers:orphan:prune khronos:context-versions:prune-expired khronos:images:prune khronos:weave:prune
+main_cron_queues: "\
+  khronos:containers:orphan:prune \
+  khronos:context-versions:prune-expired \
+  khronos:images:prune \
+  khronos:weave:prune"
+
+canary_cron_queues: "\
+  khronos:canary:build \
+  khronos:canary:github-branch \
+  khronos:canary:log \
+  khronos:canary:network \
+  khronos:metrics:container-status"
+
 # a nice version of the rabbitmq host
 cron_rabbit_host_address: "{{ rabbit_host_address }}:{{ rabbit_port }}"
 # a quick version of authentication for rabbit for cron
 cron_rabbit_auth: --username {{ rabbit_username }} --password {{ rabbit_password }}
-# this is the command we want to run in the container.
-cron_command: "bash -c \"for QUEUE in {{ cron_queues }}; do /khronos/bin/cli.js --queue \\$QUEUE --job '{}' --host {{ cron_rabbit_host_address }} {{ cron_rabbit_auth }}; done\""
-# This is the build canary cron command
-cron_build_canary_command: "/khronos/bin/cli.js --queue khronos:canary:build --job '{}' --host {{ cron_rabbit_host_address }} {{ cron_rabbit_auth }}"
-# This is the log canary cron command
-cron_log_canary_command: "/khronos/bin/cli.js --queue khronos:canary:log --job '{}' --host {{ cron_rabbit_host_address }} {{ cron_rabbit_auth }}"
-# This is the github-branch canary cron command
-cron_github_branch_canary_command: "/khronos/bin/cli.js --queue khronos:canary:github-branch --job '{}' --host {{ cron_rabbit_host_address }} {{ cron_rabbit_auth }}"
-cron_container_metrics_command: "/khronos/bin/cli.js --queue khronos:metrics:container-status --job '{}' --host {{ cron_rabbit_host_address }} {{ cron_rabbit_auth }}"
 
 # for container settings
 container_envs: >
@@ -61,5 +64,3 @@ container_run_opts: >
   -v /opt/ssl/mongo-client:/opt/ssl/mongo-client:ro
   --memory=1500m
   {{container_envs}}
-
-npm_start_command: run start-json-output

ansible/group_vars/alpha-vault.yml

@@ -14,7 +14,7 @@ container_run_opts: >
   -v /opt/runnable/vault/vault.hcl:/vault.hcl:ro
   -v /opt/vault/client-consul:/opt/vault/client-consul:ro
   -v /opt/vault/server:/opt/vault/server:ro
-  -v /var/log:/var/log:rw
+  -v {{ app_log_dir }}:{{ app_log_dir }}:rw
   -p {{ ansible_default_ipv4.address }}:8200:8200
   -p {{ ansible_default_ipv4.address }}:8201:8201
   --cap-add IPC_LOCK

ansible/roles/builder/templates/basic_node/Dockerfile

@@ -39,4 +39,4 @@ RUN {{ command }}
 {% endif %}
 
 # Define default command.
-CMD ulimit -c unlimited && /usr/local/bin/npm {{ npm_start_command | default('start') }} > /var/log/{{ name }}.log 2>&1
+CMD ulimit -c unlimited && /usr/local/bin/npm {{ npm_start_command | default('start') }} > {{ app_log_dir }}/{{ name }}.log 2>&1

ansible/roles/container_kill_start/tasks/main.yml

@@ -64,7 +64,8 @@
   command: >
     sudo docker run
     --log-driver={{ log_driver | default("none")}}
-    -v /var/log:/var/log:rw
+    -v {{ app_log_dir }}:{{ app_log_dir }}:rw
+    -v /dev/log:/dev/log:rw
     --restart={{ restart_policy | default('always') }}
     {{ container_run_opts}}
     {{ container_image }}:{{ container_tag }}

ansible/roles/container_start/tasks/main.yml

@@ -28,7 +28,7 @@
 
 - name: start new container
   tags: deploy
-  shell: for i in {{ '{' }}1..{{ number_of_containers }}{{ '}' }}; do sudo docker run --log-driver=none -v /var/log:/var/log:rw --restart={{ restart_policy | default('no') }} {{ container_run_opts }} {{ container_image }}:{{ container_tag }} {{ container_run_args }}; done
+  shell: for i in {{ '{' }}1..{{ number_of_containers }}{{ '}' }}; do sudo docker run --log-driver=none -v {{ app_log_dir }}:{{ app_log_dir }}:rw -v /dev/log://dev/log:rw --restart={{ restart_policy | default('no') }} {{ container_run_opts }} {{ container_image }}:{{ container_tag }} {{ container_run_args }}; done
   args:
     executable: /bin/bash
   register: new_container_ids

ansible/roles/docker/tasks/main.yml

@@ -23,6 +23,7 @@
   file:
     path="{{ core_file_dir }}"
     state=directory
+    owner=root
     group=root
     mode=0755
 
@@ -90,6 +91,15 @@
     update_cache=yes
     cache_valid_time=604800
 
+- name: enforce modes on /docker
+  become: true
+  file:
+    path=/docker
+    state=directory
+    owner=root
+    group=root
+    mode=0755
+
 - name: restart docker
   when: (copied_config.changed and restart is defined) or dock is defined
   command: sudo service docker restart

ansible/roles/khronos/README.md

@@ -1,3 +1,3 @@
 Run Khronos CLI tool out of cron once daily.
 
-`tasks/main.yml` - install cron entry to run `/khronos/bin/cli.js` and output to `/var/log/khonos_cron.log`
+`tasks/main.yml` - install cron entry to run `/khronos/bin/cli.js` and output to `{{ app_log_dir }}/khonos_cron.log`

ansible/roles/khronos/tasks/main.yml

@@ -2,45 +2,30 @@
   become: yes
   tags: cron
   template:
-    src: "{{ item }}"
+    src: "khronos-cron.sh"
     mode: 0744
-    dest: /opt/runnable/{{ item }}
+    dest: /opt/runnable/{{ item.script }}
   with_items:
-  - khronos-cron.sh
-  - build-canary.sh
-  - log-canary.sh
-  - github-branch-canary.sh
-  - container-metrics.sh
+  - { cron_queues: "{{ main_cron_queues }}", script: "main-cron.sh"}
+  - { cron_queues: "{{ canary_cron_queues }}", script: "canary-cron.sh"}
 
 - name: Put Khronos script into crontab
   become: yes
   tags: cron
   cron:
     name: "{{ item.name }}"
-    job: /opt/runnable/{{ item.script }} >> /var/log/{{ item.script }}.log 2>&1
+    job: /opt/runnable/{{ item.script }} >> {{ app_log_dir }}/{{ item.script }}.log 2>&1
     minute: "{{ item.minute | default('*') }}"
     hour: "{{ item.hour | default('*') }}"
     state: "{{ item.state | default('present') }}"
   with_items:
   - name: Khronos CLI - Daily Cleanup
     minute: 13
     hour: 1,7,13,19
-    script: khronos-cron.sh
+    script: main-cron.sh
   - name: Khronos CLI - Canary
     minute: "*/5"
-    script: build-canary.sh
-    state: "{% if node_env == 'production-delta' %}present{% else %}absent{% endif %}"
-  - name: Khronos CLI - Github Branch Canary
-    minute: "*/5"
-    script: github-branch-canary.sh
-    state: "{% if node_env == 'production-delta' %}present{% else %}absent{% endif %}"
-  - name: Khronos CLI - Log Canary
-    minute: "*/5"
-    script: log-canary.sh
-    state: "{% if node_env == 'production-delta' %}present{% else %}absent{% endif %}"
-  - name: Container Metrics
-    minute: "*/5"
-    script: container-metrics.sh
+    script: canary-cron.sh
     state: "{% if node_env == 'production-delta' %}present{% else %}absent{% endif %}"
 
 - name: make directory for mongo certificates