Merge branch 'master' of github.com:CodeNow/devops-scripts into SAN-3343-Install-Config-NTP

kaushikanurag · kaushikanurag · commit 262da30f73a7 · 2016-01-20T15:02:18.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
@@ -8,4 +8,5 @@
   roles:
   - { role: notify, tags: [notify] }
   - { role: git_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
@@ -60,8 +60,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
@@ -59,7 +59,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
@@ -75,7 +74,6 @@ registry_host=10.4.4.82
 swarm_token=d363b783f03a845a2c82b081bfe8443e
 user_content_domain=runnable.ninja
 api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
-no_dd_monitoring=false
 
 [ec2:vars]
 env=gamma
diff --git a/ansible/group_vars/alpha-charon.yml b/ansible/group_vars/alpha-charon.yml
@@ -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-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-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/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/ansible/stage-hosts/docks.js b/ansible/stage-hosts/docks.js
@@ -6,7 +6,7 @@ var aws = require('aws-sdk');
 var ec2 = new aws.EC2({
   accessKeyId: 'AKIAJ3RCYU6FCULAJP2Q',
   secretAccessKey: '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',
-  region: 'us-west-1'
+  region: 'us-west-2'
 });
 
 var params = {
diff --git a/ansible/stage-hosts/hosts b/ansible/stage-hosts/hosts
@@ -16,13 +16,9 @@ delta-staging-data
 [vault]
 delta-staging-data
 
-[swarm-manager]
-delta-staging-data
-
 [docks]
 
 [stage:children]
-consul
 docks
 hipache
 rabbitmq
diff --git a/ansible/stage-hosts/variables b/ansible/stage-hosts/variables
@@ -1,16 +1,25 @@
 [stage:vars]
-ansible_ssh_private_key_file=~/.ssh/Test-runnable.pem
-domain=runnable3.net
-node_env=stage
-rabbit_username=5WE5wsEQmfw9sLsppJ4CEq9Auea8mPC4kgVt3xYqKxbYHPfP
+api_hostname=api-staging-codenow.runnableapp.com
+aws_access_key_id=AKIAJ3RCYU6FCULAJP2Q
+aws_secret_access_key=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
+consul_host_address=consul-server-staging-codenow.runnableapp.com
+detention_hostname=detention-staging-codenow.runnableapp.com
+domain=runnable-angular-staging-codenow.runnableapp.com
+eru_hostname=admin-staging-codenow.runnableapp.com
+fluffy_hostname=fluffy-staging-codenow.runnableapp.com
+mavis_hostname=mavis-staging-codenow.runnableapp.com
+node_env=stageing
+optimus_hostname=optimus-staging-codenow.runnableapp.com
 rabbit_password=h7n972sPLs5tWGCWe6QPSCnaxDWjvnpEFEA9c9mBqauH3f22
-registry_host=10.0.1.254
+rabbit_username=5WE5wsEQmfw9sLsppJ4CEq9Auea8mPC4kgVt3xYqKxbYHPfP
+registry_host=10.8.4.126
+user_content_domain=runnable3.net
+vault_auth_token=ff3b5003-5949-5d7d-7c0d-4fa21efe6666
+vault_token_01=c9dd02cd0f28aaeb8b819d50d2b7b274dab5ddc7fc64871a979bcb4472c9355501
+vault_token_02=15cc2b24a82fd3876476dd28b48756f56b4a78d2a23d18f0faca390aaf17092e02
+vault_token_03=c83631a80ec7a32d83d660c46b55dd1dd14805133c0bb23962a3d1529c957bd503
 
 [vault:vars]
-vault_auth_token=db6bcf6c-eace-35b2-915a-46aeed706ad6
-vault_token_01=739b5afb7d5aa075153f750a4d0d7697f2b90ef610cc440627ab43ab60ad7bc601
-vault_token_02=7593c543320e82850d15827fb43ae7c553e6e480856a8bfaff658ae3dd75043602
-vault_token_03=e8f75fab3bc960784c7c802318207204e8f31b3bb9f1a615efd90371d05dc97803
 vault_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 vault_aws_access_key_id=AKIAJ7R4UIM45KH2WGWQ
 vault_aws_secret_key=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
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
 ################################################################################

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!`
Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,4 @@ container_run_opts: "-d --name mongodb -p 27017:27017 -v {{ db_path }}:/data/db:`
`10`	`10`
`11`	`11`	`# do not monitor docker-daemon for mongo, as there is none`
`12`	`12`	`no_dd_monitoring: true`
	`13`	`+has_dd_integration: true`