merge with master

Anandkumar Patel · Anandkumar Patel · commit 3bdb75180641 · 2016-01-20T13:38:03.000-08:00
diff --git a/README.md b/README.md
@@ -109,4 +109,4 @@ It is the custom at Runnable to play a song to the entire team when deploying. F
 
 [Link: Zelda Main Theme Song](https://www.youtube.com/watch?v=cGufy1PAeTU)
 
-**IMPORTANT:** Make sure the play the song loud and proud when deploying!
+**IMPORTANT:** Make sure to play the song loud and proud when deploying!
diff --git a/ansible/charon.yml b/ansible/charon.yml
@@ -9,4 +9,5 @@
   - { role: notify, tags: [notify] }
   - { role: git_repo, tags: [deploy] }
   - { role: node_service, tags: [deploy] }
+  - { role: loggly-rotate }
   - { role: consul_value, tags: [deploy, consul_value] }
diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables
@@ -25,6 +25,9 @@ khronos_mongo_auth=api:72192e5a-a5e1-11e5-add9-0270db32f7ad
 khronos_mongo_database=delta
 khronos_mongo_replset_name=delta
 
+[navi:vars]
+navi_new_relic_app_name=delta-navi
+
 [optimus:vars]
 optimus_aws_access_id=AKIAJWSSSJYUXKNW2ZDA
 optimus_aws_secret_id=tyvGiCbj5jWCiQnMLvfrfD64dFo8i6prkdcga86y
@@ -53,8 +56,9 @@ vault_aws_region=us-east-1
 [delta:vars]
 ansible_ssh_private_key_file=~/.ssh/delta.pem
 api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
-datadog_host_address=10.8.5.63
 datadog_tags=env:delta
+datadog_mongodb_user=datadog
+datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ
 domain=runnable.io
 mongo_port=27017
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables
@@ -25,6 +25,9 @@ khronos_mongo_auth=api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
 khronos_mongo_database=gamma
 khronos_mongo_replset_name=gamma
 
+[navi:vars]
+navi_new_relic_app_name=gamma-navi
+
 [optimus:vars]
 optimus_aws_access_id=AKIAJPA2ZYSVVA5V7XXQ
 optimus_aws_secret_id=5V70AUxfIyHeLvlYZe0xaYevDAdgTOWOn5G7nHlt
@@ -52,7 +55,6 @@ vault_aws_region=us-east-1
 
 [gamma:vars]
 ansible_ssh_private_key_file=~/.ssh/gamma.pem
-datadog_host_address=10.4.6.251
 datadog_tags=env:gamma
 datadog_mongodb_user=datadog
 datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -35,6 +35,7 @@ loggly_username: ops
 # api
 api_github_hook_secret: 3V3RYTHINGisAW3S0ME!
 api_hostname: api.{{ domain }}
+api_url: https://{{ api_hostname }}
 api_neo4j_port: 7474
 api_neo4j_protocol: http://
 api_port: 80
diff --git a/ansible/group_vars/alpha-api.yml b/ansible/group_vars/alpha-api.yml
@@ -25,11 +25,11 @@ container_envs: >
   -e DATADOG_PORT={{ datadog_port }}
   -e DOMAIN={{ domain }}
   -e FILIBUSTER_PORT={{ filibuster_port }}
-  -e GITHUB_CALLBACK_URL=https://{{ api_hostname }}/auth/github/callback
+  -e GITHUB_CALLBACK_URL={{ api_url }}/auth/github/callback
   -e GITHUB_CLIENT_ID={{ api_github_client_id }}
   -e GITHUB_CLIENT_SECRET={{ api_github_client_secret }}
   -e GITHUB_DEPLOY_KEYS_BUCKET={{ api_github_deploy_keys_bucket }}
-  -e GITHUB_HOOK_URL=https://{{ api_hostname }}/actions/github
+  -e GITHUB_HOOK_URL={{ api_url }}/actions/github
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
   -e KRAIN_PORT={{ krain_port }}
   -e MAVIS_HOST=http://{{ mavis_hostname }}:80
diff --git a/ansible/group_vars/alpha-charon.yml b/ansible/group_vars/alpha-charon.yml
@@ -4,7 +4,7 @@ app_repo: git@github.com:CodeNow/{{ name }}.git
 hosted_ports: ["{{ charon_port }}"]
 
 enviroment_vars:
-  API_HOST: "{{ api_hostname }}"
+  API_URL: "{{ api_url }}"
   API_TOKEN: 51c61b779f3de616a9639cfc44a22c79fbd8e328
   DATADOG_HOST: "{{ datadog_host_address }}"
   DATADOG_PORT: "{{ datadog_port }}"
@@ -17,3 +17,5 @@ enviroment_vars:
 consul_values:
   - key: "{{ name }}/version"
     value: "{{ git_branch }}"
+  - key: api/url
+    value: "{{ api_url }}"
diff --git a/ansible/group_vars/alpha-consul.yml b/ansible/group_vars/alpha-consul.yml
@@ -44,3 +44,5 @@ consul_seed:
     value: "{{ node_env }}"
   - key: api/hostname
     value: "{{ api_hostname }}"
+  - key: api/url
+    value: "{{ api_url }}"
diff --git a/ansible/group_vars/alpha-detention.yml b/ansible/group_vars/alpha-detention.yml
@@ -17,7 +17,7 @@ dockerfile_post_install_commands: [
 
 container_envs: >
   -e ABSOLUTE_URL={{ detention_hostname }}
-  -e API_HOSTNAME={{ api_hostname }}
+  -e API_URL={{ api_url }}
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
   -e NODE_ENV={{ node_env }}
   -e PORT={{ hosted_ports[0] }}
diff --git a/ansible/group_vars/alpha-eru.yml b/ansible/group_vars/alpha-eru.yml
@@ -15,7 +15,7 @@ container_envs: >
   -e ADMIN_DOMAIN={{ eru_hostname }}
   -e ADMIN_GITHUB_ID={{ eru_github_id }}
   -e ADMIN_GITHUB_SECRET={{ eru_github_secret }}
-  -e API_HOST={{ api_hostname }}
+  -e API_URL={{ api_url }}
   -e RUNNABLE_HOST={{ domain }}
   -e PORT={{ hosted_ports[0] }}
 
diff --git a/ansible/group_vars/alpha-link.yml b/ansible/group_vars/alpha-link.yml
@@ -7,7 +7,7 @@ node_version: "4.2.1"
 npm_version: "2.14.7"
 
 container_envs: >
-  -e API_HOST=http://{{ api_hostname }}
+  -e API_URL={{ api_url }}
   -e DATADOG_HOST={{ datadog_host_address }}
   -e DATADOG_PORT={{ datadog_port }}
   -e HELLO_RUNNABLE_GITHUB_TOKEN=5d8f7029d3d6941b0fc62a7eb8c605d8e0bc7c29
diff --git a/ansible/group_vars/alpha-mongo.yml b/ansible/group_vars/alpha-mongo.yml
@@ -10,3 +10,4 @@ container_run_opts: "-d --name mongodb -p 27017:27017 -v {{ db_path }}:/data/db:
 
 # do not monitor docker-daemon for mongo, as there is none
 no_dd_monitoring: true
+has_dd_integration: true
diff --git a/ansible/group_vars/alpha-navi.yml b/ansible/group_vars/alpha-navi.yml
@@ -4,7 +4,7 @@ container_image: "registry.runnable.com/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 hosted_ports: ["{{ navi_port }}"]
-node_version: "4.1.0"
+node_version: "4.2.4"
 npm_version: "2.8.3"
 
 container_envs: >
@@ -16,6 +16,10 @@ container_envs: >
   -e HTTP_PORT={{ hosted_ports[0] }}
   -e LOG_LEVEL_STDOUT=trace
   -e MONGO=mongodb://{{ navi_mongo_host_address }}:{{ navi_mongo_port }}/{{ navi_mongo_database }}
+  -e NEW_RELIC_APP_NAME={{ navi_new_relic_app_name }}
+  -e NEW_RELIC_LICENSE_KEY={{ new_relic_license_key }}
+  -e NEW_RELIC_LOG_LEVEL=fatal
+  -e NEW_RELIC_NO_CONFIG_FILE=true
   -e NODE_ENV={{ node_env }}
   -e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
   -e RABBITMQ_PASSWORD={{ rabbit_password }}
diff --git a/ansible/group_vars/alpha-rabbitmq.yml b/ansible/group_vars/alpha-rabbitmq.yml
@@ -10,5 +10,5 @@ container_tag: "3.5.3-management"
 container_run_opts: "-d --name prod-rabbit -v {{ db_path }}:/var/lib/rabbitmq:rw -v {{ config_path }}/rabbitmq.config:/etc/rabbitmq/rabbitmq.config:ro -p 54320:15672 -p 54321:5672"
 
 hosted_ports: [ 5672, 15672 ]
-# monitor the docker-daemon
-no_dd_monitoring: false
+# DD integration for RabbitMQ
+has_dd_integration: true
diff --git a/ansible/group_vars/alpha-sauron.yml b/ansible/group_vars/alpha-sauron.yml
@@ -29,6 +29,8 @@ container_envs: >
   -e RABBITMQ_PASSWORD="{{ rabbit_password }}"
   -e RABBITMQ_PORT="{{ rabbit_port }}"
   -e RABBITMQ_USERNAME="{{ rabbit_username }}"
+  -e SWARM_HOSTNAME={{ swarm_host_address }}
+  -e SWARM_PORT={{ swarm_master_port }}  
   -e WEAVE_PATH={{ weave_path }}
 
 container_run_opts: >
diff --git a/ansible/group_vars/alpha-web.yml b/ansible/group_vars/alpha-web.yml
@@ -9,7 +9,7 @@ npm_version: "2.1.18"
 rollbar_token: "162a053bebd34e9eb6e2860543c7ae79"
 
 dockerfile_enviroment: [
-  "API_HOST //api.{{ domain }}",
+  "API_URL https://api.{{ domain }}",
   "USER_CONTENT_DOMAIN {{ user_content_domain }}",
   "NODE_ENV production"
 ]
diff --git a/ansible/group_vars/alpha-workers.yml b/ansible/group_vars/alpha-workers.yml
@@ -18,11 +18,11 @@ container_envs: >
   -e DATADOG_PORT={{ datadog_port }}
   -e DOMAIN={{ domain }}
   -e FILIBUSTER_PORT={{ filibuster_port }}
-  -e GITHUB_CALLBACK_URL=https://{{ api_hostname }}/auth/github/callback
+  -e GITHUB_CALLBACK_URL={{ api_url }}/auth/github/callback
   -e GITHUB_CLIENT_ID={{ api_github_client_id }}
   -e GITHUB_CLIENT_SECRET={{ api_github_client_secret }}
   -e GITHUB_DEPLOY_KEYS_BUCKET={{ api_github_deploy_keys_bucket }}
-  -e GITHUB_HOOK_URL=https://{{ api_hostname }}/actions/github
+  -e GITHUB_HOOK_URL={{ api_url }}/actions/github
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
   -e IS_QUEUE_WORKER=true
   -e KRAIN_PORT={{ krain_port }}
diff --git a/ansible/roles/apt_update/tasks/main.yml b/ansible/roles/apt_update/tasks/main.yml
@@ -0,0 +1,5 @@
+---
+- name: update cache for apt repository
+  sudo: yes
+  apt:
+    update_cache=yes
diff --git a/ansible/roles/apt_upgrade/tasks/main.yml b/ansible/roles/apt_upgrade/tasks/main.yml
@@ -0,0 +1,5 @@
+---
+- name: upgrade a server
+  sudo: yes
+  apt:
+     upgrade=full
diff --git a/ansible/roles/builder/meta/main.yml b/ansible/roles/builder/meta/main.yml
@@ -1,3 +1,4 @@
 ---
 dependencies:
   - { role: docker }
+  - { role: apt_update }
diff --git a/ansible/roles/container_kill_start/files/findTagRunning.sh b/ansible/roles/container_kill_start/files/findTagRunning.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+IMAGE_NAME="$1"
+RUNNING_CONTAINERS=""
+
+CONTAINERS=`docker ps | grep -v '^CONTAINER' | awk '{print $1}'`
+
+if [ "" = "${CONTAINERS}" ] ; then
+    exit 0
+else
+    for container in ${CONTAINERS} ; do
+        docker inspect ${container} | grep -q ${IMAGE_NAME}
+        if [ ${?} -eq 0 ] ; then
+            RUNNING_CONTAINERS="${container} "
+        fi
+    done
+fi
+
+echo "${RUNNING_CONTAINERS}"
diff --git a/ansible/roles/container_kill_start/tasks/main.yml b/ansible/roles/container_kill_start/tasks/main.yml
@@ -1,4 +1,3 @@
----
 - name: "look for stopped {{ container_image }} containers"
   shell: >
     sudo docker ps -a |
@@ -13,9 +12,17 @@
   shell: sudo docker rm {{ item }}
   with_items: stopped_containers.stdout_lines
 
+- name: "copy find running containers with this image tag util script"
+  sudo: yes
+  copy:
+    src=findTagRunning.sh
+    dest=/root/findTagRunning.sh
+    mode=0700
+
 # 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}'"
+  sudo: yes
+  shell: "/root/findTagRunning.sh {{ container_image }}"
   register: old_containers_id
   changed_when: old_containers_id.stdout != ''
 
diff --git a/ansible/roles/datadog/tasks/main.yml b/ansible/roles/datadog/tasks/main.yml
@@ -27,7 +27,7 @@
 
 - name: add docker to dd-agent group
   sudo: yes
-  when: no_dd_monitoring != true
+  when: no_dd_monitoring is defined
   user:
     name=dd-agent
     groups=docker
@@ -57,7 +57,7 @@
 
 - name: install docker integration
   sudo: yes
-  when: no_dd_monitoring != true
+  when: no_dd_monitoring is defined
   template:
     src=docker_daemon.yaml.j2
     dest=/etc/dd-agent/conf.d/docker_daemon.yaml
@@ -66,7 +66,7 @@
 # assumes a config for {{ name }} exists
 - name: install datadog integrations
   sudo: yes
-  when: docker_config != "docks"
+  when: has_dd_integration is defined
   template:
     src="{{ name }}.yaml.j2"
     dest="/etc/dd-agent/conf.d/{{ name }}.yaml"
diff --git a/ansible/roles/datadog/templates/datadog.conf.j2 b/ansible/roles/datadog/templates/datadog.conf.j2
@@ -6,3 +6,5 @@ dd_url: https://app.datadoghq.com
 api_key: {{ datadog_api_key }}
 
 use_mount: no
+
+bind_host: 0.0.0.0
diff --git a/ansible/roles/khronos/tasks/main.yml b/ansible/roles/khronos/tasks/main.yml
@@ -6,12 +6,23 @@
     mode=0744
     dest="/opt/runnable/khronos-cron.sh"
 
-# Run Cronjob once every day at 11:30am PST (19:30 UTC).
-- name: Put Khronos CLI job in place
+# Run Cronjob at 6 hour intervals.
+- name: Put Khronos CLI script in crontab
   sudo: yes
   tags: cron
+  cron:
+    name="Khronos CLI"
+    minute="13"
+    hour="1,7,13,19"
+    job="/opt/runnable/khronos-cron.sh >> /var/log/khronos_cron.log 2>&1"
+
+# Run Cronjob once every day at 11:30am PST (19:30 UTC).
+- name: Remove old Khronos CLI cronjob
+  sudo: yes 
+  tags: cron
   cron:
     name="Khronos CLI Daily"
     minute="30"
     hour="19"
     job="/opt/runnable/khronos-cron.sh >> /var/log/khronos_cron.log 2>&1"
+    state="absent"
diff --git a/ssh/config b/ssh/config
@@ -11,22 +11,16 @@ Host delta*
   Identityfile ~/.ssh/delta.pem
 
 ################################################################################
-# oregon
+# utility
 ################################################################################
-Host oregon-bastion
-  HostName 52.25.121.228
-  User ubuntu
-  ForwardAgent yes
-  IdentityFile ~/.ssh/oregon.pem
-
 Host migration-router
-  ProxyCommand ssh -q ubuntu@oregon-bastion nc 10.2.0.254 22
+  HostName 52.24.117.16
   User ubuntu
   ForwardAgent yes
   IdentityFile ~/.ssh/oregon.pem
 
 Host hubot
-  ProxyCommand ssh -q ubuntu@oregon-bastion nc 10.2.0.230 22
+  HostName 52.24.128.35
   User ubuntu
   ForwardAgent yes
   IdentityFile ~/.ssh/oregon.pem
@@ -38,15 +32,6 @@ Host hubot
 Host delta-staging-data
   ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.6.59 22
 
-################################################################################
-# oregon
-################################################################################
-Host oregon-bastion
-  HostName 52.25.121.228
-  User ubuntu
-  ForwardAgent yes
-  IdentityFile ~/.ssh/oregon.pem
-
 ################################################################################
 # Gamma
 ################################################################################
diff --git a/wiki/swarm-setup.gif b/wiki/swarm-setup.gif

Original file line number	Diff line number	Diff line change
`@@ -109,4 +109,4 @@ It is the custom at Runnable to play a song to the entire team when deploying. F`
`109`	`109`
`110`	`110`	`[Link: Zelda Main Theme Song](https://www.youtube.com/watch?v=cGufy1PAeTU)`
`111`	`111`
`112`		`-IMPORTANT: Make sure the play the song loud and proud when deploying!`
	`112`	`+IMPORTANT: Make sure to play the song loud and proud when deploying!`