Merge branch 'master' into SAN-3910-move-core-files

Author: Christopher M. Neill

ansible/base.yml

@@ -0,0 +1,12 @@
+---
+- hosts: "{{ host }}"
+  roles:
+  - { role: notify, tags: [ notify ], app_name: base_sshd, git_branch: latest, name: base_sshd }
+  - { role: package-dock, tags: [dock, package] }
+  - { role: package-aws, tags: [dock, package] }
+  - { role: package_ntp }
+  - { role: docker, tags: [docker] }
+  - { role: datadog, tags: [datadog] }
+  - { role: ulimits, tags: [ulimits] }
+  - { role: loggly-tls, tags: [loggly] }
+  - { role: node }

ansible/consul-values.yml

@@ -4,7 +4,7 @@
     - "group_vars/alpha-consul.yml"
   tasks:
     - name: make sure httplib2 is installed
-      sudo: yes
+      become: true
       apt: package=python-httplib2 state=present
 
     - name: put values into consul

ansible/delta-hosts/variables

@@ -31,14 +31,16 @@ eru_github_id=46a23f5f99f0aa9460f8
 eru_github_secret=a0336d72e3d540fb9fbbed2c123a81e1cb329dab
 
 [khronos:vars]
+intercom_api_key=14771f14efb617900724a16345e57beb55ba9beb
+intercom_app_id=wqzm3rju
+khronos_canary_github_branches_instance_id=56f05754a443842400b66a53
+khronos_canary_logs_instance_id=56f07f5c1e089a200077f2a3
+khronos_canary_rebuild_instance_id=56df6674058d592500f76c9f
+khronos_canary_rebuild_navi_url=http://canary-build-staging-runnabletest.runnableapp.com:8000/
+khronos_canary_token=24592325a6f881e77a01e3bacf0952c49f4e9f1c
 khronos_mongo_auth=api:72192e5a-a5e1-11e5-add9-0270db32f7ad
 khronos_mongo_database=delta
 khronos_mongo_replset_name=delta
-khronos_canary_token=24592325a6f881e77a01e3bacf0952c49f4e9f1c
-khronos_canary_rebuild_instance_id=56df6674058d592500f76c9f
-khronos_canary_rebuild_navi_url=http://canary-build-staging-runnabletest.runnableapp.com:8000/
-khronos_canary_logs_instance_id=56f07f5c1e089a200077f2a3
-khronos_canary_github_branches_instance_id=56f05754a443842400b66a53
 
 [metis:vars]
 metis_rollbar_key=fdc8565a7ce64c6d9432c34be425937c

ansible/detention.yml

@@ -1,5 +1,6 @@
 ---
 - hosts: redis
+- hosts: consul
 
 - hosts: detention
   vars_files:

ansible/eru.yml

@@ -1,5 +1,6 @@
 ---
 - hosts: redis
+- hosts: consul
 
 - hosts: eru
   vars_files:

ansible/gamma-hosts/variables

@@ -33,9 +33,6 @@ eru_github_secret=74a23ee56486d57b14f292283cb04625f600917c
 khronos_mongo_auth=api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
 khronos_mongo_database=gamma
 khronos_mongo_replset_name=gamma
-khronos_canary_token=d939b612d75244947c9e07b3fec22c9fe95f13ae
-khronos_canary_rebuild_instance_id=56e077e595ba23200046ce7a
-khronos_canary_rebuild_navi_url=http://canary-build-staging-runnabletest.runnable.ninja:8000/
 
 [metis:vars]
 metis_rollbar_key=fdc8565a7ce64c6d9432c34be425937c

ansible/group_vars/alpha-khronos.yml

@@ -21,19 +21,25 @@ cron_build_canary_command: "/khronos/bin/cli.js --queue khronos:canary:build --j
 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: >
-  -e API_URL={{ api_url }}
   -e API_SOCKET_SERVER=https://{{ api_socket_server_hostname }}
-  -e CANARY_API_TOKEN={{ khronos_canary_token }}
-  -e CANARY_REBUILD_INSTANCE_ID={{ khronos_canary_rebuild_instance_id }}
-  -e CANARY_REBUILD_NAVI_URL={{ khronos_canary_rebuild_navi_url }}
+  -e API_URL={{ api_url }}
+  -e CANARY_API_TOKEN={{ khronos_canary_token | default('undefined') }}
+  -e CANARY_GITHUB_BRANCHES_INSTANCE_ID={{ khronos_canary_github_branches_instance_id | default('undefined') }}
+  -e CANARY_LOG_INSTANCE_ID={{ khronos_canary_logs_instance_id | default('undefined') }}
+  -e CANARY_LOG_TERMINAL_SLEEP=10
+  -e CANARY_REBUILD_INSTANCE_ID={{ khronos_canary_rebuild_instance_id | default('undefined') }}
+  -e CANARY_REBUILD_NAVI_URL={{ khronos_canary_rebuild_navi_url | default('undefined') }}
   -e DATADOG_HOST={{ datadog_host_address }}
   -e DATADOG_PORT={{ datadog_port }}
-  -e KHRONOS_PREFETCH=6
+  -e INTERCOM_API_KEY={{ intercom_api_key | default('undefined') }}
+  -e INTERCOM_APP_ID={{ intercom_app_id | default('undefined') }}
   -e KHRONOS_MAVIS=http://{{ mavis_hostname }}
   -e KHRONOS_MONGO=mongodb://{{ khronos_mongo_auth }}@{{ mongo_hosts }}/{{ khronos_mongo_database }}
+  -e KHRONOS_PREFETCH=6
   -e LOG_LEVEL=error
   {% if node_env != "production-epsilon" %}
     -e MONGO_CACERT=/opt/ssl/mongo-client/ca.pem
@@ -45,10 +51,8 @@ container_envs: >
   -e RABBITMQ_PASSWORD={{ rabbit_password }}
   -e RABBITMQ_PORT={{ rabbit_port }}
   -e RABBITMQ_USERNAME={{ rabbit_username }}
+  -e SWARM_HOST=http://{{ swarm_host_address }}:{{ swarm_master_port }}
   -e WORKER_MAX_RETRY_DELAY=3600000
-  -e CANARY_LOG_TERMINAL_SLEEP=10
-  -e CANARY_LOG_INSTANCE_ID={{khronos_canary_logs_instance_id}}
-  -e CANARY_GITHUB_BRANCHES_INSTANCE_ID={{khronos_canary_github_branches_instance_id}}
 
 container_run_opts: >
   -h {{ name }}

ansible/khronos.yml

@@ -2,6 +2,7 @@
 - hosts: rabbitmq
 - hosts: mongodb
 - hosts: consul
+- hosts: swarm-manager
 
 - hosts: khronos
   vars_files:
@@ -14,4 +15,3 @@
   - { role: builder, tags: [ build ] }
   - { role: khronos, tags: [ deploy ] }
   - { role: container_kill_start }
-

ansible/oneOffScripts/killWeaveContainers.yml

@@ -3,5 +3,5 @@
   serial: 1
   tasks:
   - name: kill weave containers
-    sudo: yes
+    become: true
     shell: 'sudo docker ps | grep weaveworks/weave | cut -d" " -f 1 | xargs sudo docker kill'

ansible/oneOffScripts/ntpForceUpdate.yml

@@ -5,6 +5,6 @@
 
 #  pl test on test box
   - name: Froce ntp update
-    sudo: yes
+    become: true
     shell:
       "service ntp stop && /usr/sbin/ntpdate pool.ntp.org && service ntp start"