Merge branch 'master' into swarm-api

anandkumarpatel · anandkumarpatel · commit 9ca60f6d1745 · 2015-11-09T15:10:51.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,6 @@ node_modules
 ca-key.pem
 pass
 hellorunnable
+dump.rdb
+erl_crash.dump
+npm-debug.log
diff --git a/ansible/beta-hosts/hosts b/ansible/beta-hosts/hosts
@@ -20,14 +20,22 @@ api
 [api]
 beta-api
 
+[consul]
+beta-services
+beta-api
+beta-web
+
+[vault]
+beta-services
+
 [worker]
 beta-api
 
 [eru]
 beta-services
 
 [navi]
-beta-services
+beta-navi
 
 [charon]
 beta-services
diff --git a/ansible/consul-values.yml b/ansible/consul-values.yml
@@ -0,0 +1,15 @@
+---
+- hosts: "{{ target }}"
+  tasks:
+  - name: make sure `jq` is present
+    apt:
+      name=jq
+      state=present
+
+  - name: get versions in ansible
+    script: getVersions {{ ansible_default_ipv4.address }}
+    register: versions_result
+
+  - name: print versions to stdout
+    debug:
+      msg="Versions in Consul\n{{ versions_result.stdout }}"
diff --git a/ansible/consul.yml b/ansible/consul.yml
@@ -0,0 +1,9 @@
+---
+- hosts: consul
+  serial: 1
+  vars_files:
+    - group_vars/alpha-consul.yml
+  roles:
+  - { role: notify, tags: notify }
+  - { role: database }
+  - { role: container_kill_start, tags: deploy }
diff --git a/ansible/gamma-hosts/docks.js b/ansible/gamma-hosts/docks.js
@@ -14,7 +14,7 @@ var params = {
     // Only search for docks in the cluster security group
     {
       Name: 'instance.group-id',
-      Values: ['sg-87ca04e3']
+      Values: ['sg-577a0d33']
     },
     // Only fetch instances that are tagged as docks
     {
diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables
@@ -53,7 +53,7 @@ domain=runnable-gamma.com
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env=production-gamma
 pg_host=gamma-infrastructure-db.cnksgdqarobf.us-west-2.rds.amazonaws.com
-pg_pass=QBjSpAXVYwmGHu4Y
+pg_pass=e9G7zYRCxYmxG9HQ8J9x2BDB
 rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
 rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 registry_host=10.4.4.82
diff --git a/ansible/getVersions.sh b/ansible/getVersions.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+consul=localhost:8500/v1
+
+if [[ $1 != "" ]]; then
+  consul=$1:8500/v1
+fi
+
+kv=$consul/kv
+
+echo NODE_ENV: $(curl -s $kv/node/env | jq -r '.[0].Value' | base64 -d)
+
+echo image-builder: $(curl -s $kv/image-builder/version | jq -r '.[0].Value' | base64 -d)
+echo docker-listener: $(curl -s $kv/docker-listener/version | jq -r '.[0].Value' | base64 -d)
+echo filibuster: $(curl -s $kv/filibuster/version | jq -r '.[0].Value' | base64 -d)
+echo krain: $(curl -s $kv/krain/version | jq -r '.[0].Value' | base64 -d)
+echo sauron: $(curl -s $kv/sauron/version | jq -r '.[0].Value' | base64 -d)
+echo charon: $(curl -s $kv/charon/version | jq -r '.[0].Value' | base64 -d)
diff --git a/ansible/group_vars/alpha-consul.yml b/ansible/group_vars/alpha-consul.yml
@@ -0,0 +1,34 @@
+name: consul
+
+# for database role
+db_path: /etc/consul.d
+
+# for container_kill_start
+pause_length_minutes: 3
+
+container_image: progrium/consul
+container_tag: latest
+
+container_run_opts: >
+  -d
+  -h {{ inventory_hostname }}
+  -v /consul:/data
+  -v /etc/consul.d:/etc/consul.d:ro
+  -p {{ ansible_default_ipv4.address }}:8300:8300
+  -p {{ ansible_default_ipv4.address }}:8301:8301
+  -p {{ ansible_default_ipv4.address }}:8301:8301/udp
+  -p {{ ansible_default_ipv4.address }}:8302:8302
+  -p {{ ansible_default_ipv4.address }}:8302:8302/udp
+  -p {{ ansible_default_ipv4.address }}:8400:8400
+  -p {{ ansible_default_ipv4.address }}:8500:8500
+  --restart=always
+
+container_run_args: >
+  -server
+  -node {{ inventory_hostname }}
+  -advertise {{ ansible_default_ipv4.address }}
+  -config-dir /etc/consul.d
+  {% if hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] == ansible_default_ipv4.address %}-bootstrap-expect {{ groups['consul'] | length }}{% endif %}
+  -data-dir /data
+  {% if hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] == ansible_default_ipv4.address %}-ui-dir /ui{% endif %}
+  {% if hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] != ansible_default_ipv4.address %}-retry-join {{ hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] }}{% endif %}
diff --git a/ansible/group_vars/alpha-navi.yml b/ansible/group_vars/alpha-navi.yml
@@ -21,5 +21,6 @@ container_envs: >
   -e NODE_ENV={{ node_env }}
   -e REDIS_IPADDRESS={{redis_host}}
   -e LOG_LEVEL_STDOUT=trace
+  -e CLUSTER_WORKERS=20
 
 container_run_opts: "-d -p {{hosted_ports[0]}}:{{hosted_ports[0]}} {{container_envs}}"
diff --git a/ansible/group_vars/alpha-vault.yml b/ansible/group_vars/alpha-vault.yml
@@ -0,0 +1,20 @@
+name: vault
+
+# for database role
+db_path: /opt/runnable/vault
+
+container_image: runnable/vault
+container_tag: v0.3.1
+
+container_run_opts: >
+  -d
+  -h {{ inventory_hostname }}
+  -v /opt/runnable/vault/vault.hcl:/vault.hcl:ro
+  -p {{ ansible_default_ipv4.address }}:8200:8200
+  --cap-add IPC_LOCK
+  --restart=always
+
+container_run_args: >
+  server
+  -log-level=warn
+  -config=/vault.hcl
diff --git a/ansible/navi.yml b/ansible/navi.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: redis
+- hosts: detention
 
 - hosts: navi
   vars_files:
diff --git a/ansible/prod-hosts/hosts b/ansible/prod-hosts/hosts
@@ -26,14 +26,22 @@ api
 [api]
 alpha-api
 
+[consul]
+alpha-api-old
+alpha-api
+alpha-web
+
+[vault]
+alpha-api-old
+
 [worker]
 alpha-api
 
 [eru]
 alpha-api-old
 
 [navi]
-alpha-api-old
+alpha-navi
 
 [charon]
 alpha-api-old
diff --git a/ansible/roles/container_kill_start/tasks/main.yml b/ansible/roles/container_kill_start/tasks/main.yml
@@ -46,6 +46,10 @@
   command: sudo docker rm {{ item }}
   with_items: old_containers_id.stdout_lines
 
+- name: pause to allow for any odd conditions in system caching tables
+  when: pause_length_minutes is defined and old_containers_id.changed
+  pause: minutes={{pause_length_minutes}}
+
 # start our new container with options and args
 - name: start container
   command: >
diff --git a/ansible/roles/git_node_service/tasks/main.yml b/ansible/roles/git_node_service/tasks/main.yml
@@ -1,11 +1,4 @@
 ---
-- name: copy config file
-  sudo: yes
-  template:
-    src=upstart.conf
-    dest=/etc/init/{{ app_name }}.conf
-    backup=yes
-
 - name: create {{ app_name }} repository dir
   sudo: yes
   file:
@@ -26,6 +19,7 @@
 
 - name: remove node_modules
   sudo: yes
+  when: remove_node_modules is defined
   file:
     path=/opt/runnable/{{ app_name }}/node_modules
     state=absent
diff --git a/ansible/roles/git_node_service/templates/upstart.conf b/ansible/roles/git_node_service/templates/upstart.conf
diff --git a/ansible/roles/sauron/tasks/main.yml b/ansible/roles/sauron/tasks/main.yml
@@ -39,9 +39,3 @@
   shell: "docker kill `docker ps | grep weave | awk '{print $1}'` || echo"
   when: weave_install.changed
   sudo: yes
-
-- name: get org id
-  sudo: yes
-  when: docker_config == "docks"
-  shell: "cut -d, -f 1 /opt/runnable/host_tags"
-  register: org_id
diff --git a/ansible/roles/vault/tasks/main.yml b/ansible/roles/vault/tasks/main.yml
@@ -0,0 +1,5 @@
+- name: copy vault config
+  sudo: yes
+  template:
+    src=vault.hcl
+    dest=/opt/runnable/vault/vault.hcl
diff --git a/ansible/roles/vault/templates/vault.hcl b/ansible/roles/vault/templates/vault.hcl
@@ -0,0 +1,10 @@
+backend "consul" {
+  address = "{{ ansible_default_ipv4.address }}:8500"
+  path = "vault"
+  advertise_addr = "http://{{ ansible_default_ipv4.address }}:8200"
+}
+
+listener "tcp" {
+ address = "0.0.0.0:8200"
+ tls_disable = 1
+}
diff --git a/ansible/vault.yml b/ansible/vault.yml
@@ -0,0 +1,9 @@
+---
+- hosts: vault
+  vars_files:
+    - group_vars/alpha-vault.yml
+  roles:
+  - { role: notify, tags: notify }
+  - { role: database }
+  - { role: vault }
+  - { role: container_kill_start, tags: deploy }
diff --git a/ssh/config b/ssh/config
@@ -60,6 +60,9 @@ Host alpha-mongodb03
 Host alpha-api-old
   ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.239 22
 
+Host alpha-navi
+  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.39 22
+
 Host alpha-api
   ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.142 22
 
@@ -169,6 +172,9 @@ Host beta-api
 Host beta-services
   ProxyCommand ssh -q ubuntu@beta-bastion nc 10.20.1.59 22
 
+Host beta-navi
+  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.20.1.232 22
+
 Host beta-rabbit
   ProxyCommand ssh -q ubuntu@beta-bastion nc 10.20.1.60 22
 
@@ -205,10 +211,10 @@ Host gamma-hipache-us-west-2a
 
 ## Gamma API
 Host gamma-api
-  ProxyCommand ssh -q ubuntu@gamma-bastion nc 10.4.4.188 22
+  ProxyCommand ssh -q ubuntu@gamma-bastion nc 10.4.6.67 22
 
 Host gamma-api-us-west-2a
-  ProxyCommand ssh -q ubuntu@gamma-bastion nc 10.4.4.188 22
+  ProxyCommand ssh -q ubuntu@gamma-bastion nc 10.4.6.67 22
 
 ## Gamma MongoDB
 Host gamma-mongo-us-west-2a

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ var params = {`
`14`	`14`	`// Only search for docks in the cluster security group`
`15`	`15`	`{`
`16`	`16`	`Name: 'instance.group-id',`
`17`		`- Values: ['sg-87ca04e3']`
	`17`	`+ Values: ['sg-577a0d33']`
`18`	`18`	`},`
`19`	`19`	`// Only fetch instances that are tagged as docks`
`20`	`20`	`{`