Merge branch 'master' of github.com:CodeNow/devops-scripts into add-big-poppa

thejsj · thejsj · commit ce3fedfea9ca · 2016-07-25T16:34:43.000-07:00
* 'master' of github.com:CodeNow/devops-scripts:
  hotfix khronos timeout
  set mem limit to 1g by default
  bump swarm to 1.2.3
  remove prefetch from khronos
  add memory limit and make syslog optional
  add delta ingress hosts
  add delta ingress
  fix nits
  I'm going insane
  make queue worker 1
  wow
  add nginx and reggi to gamma
  using all.yml instead
  adding the email github token
  Adding sendgrid creds
  update datadog docker config
diff --git a/ansible/api-core.yml b/ansible/api-core.yml
@@ -16,9 +16,18 @@
   - role: notify
     rollbar_token: "{{ api_rollbar_key }}"
     tags: [ notify ]
-  - { role: redis_key, tags: [ setup, redis_key ] }
-  - { role: builder, tags: [ build ] }
-  - { role: docker_client }
-  - { role: tls-client, tls_service: mongodb, tags: [ tls ] }
-  - { role: datadog, tags: [ datadog ] }
-  - { role: container_start }
+
+  - role: builder
+    tags: [ build ]
+
+  - role: docker_client
+
+  - role: tls-client
+    tags: [ tls ]
+    tls_service: mongodb
+
+  - role: datadog
+    tags: [ datadog ]
+
+  - role: container_start
+    number_of_containers: "{{ ansible_processor_cores }}"
diff --git a/ansible/consul-template-updater.yml b/ansible/consul-template-updater.yml
@@ -1,7 +1,7 @@
 ---
 - hosts: consul
 
-- hosts: userland
+- hosts: "{{ host }}"
   vars_files:
   - group_vars/{{ var_file }}
   - group_vars/alpha-consul-template-updater.yml
diff --git a/ansible/delta-hosts/hosts b/ansible/delta-hosts/hosts
@@ -15,6 +15,9 @@ delta-mongo-c
 [neo4j]
 delta-neo4j
 
+[ingress]
+delta-ingress
+
 [api_group:children]
 worker
 api
@@ -131,6 +134,7 @@ drake
 eru
 github-varnish
 hipache
+ingress
 khronos
 mavis
 metis
diff --git a/ansible/gamma-hosts/hosts b/ansible/gamma-hosts/hosts
@@ -48,6 +48,9 @@ gamma-app-services
 [navi]
 gamma-navi
 
+[ingress]
+gamma-ingress
+
 [link]
 gamma-navi
 
@@ -130,6 +133,7 @@ drake
 eru
 github-varnish
 hipache
+ingress
 khronos
 mavis
 metis
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -150,6 +150,7 @@ palantiri_rollbar_token: f675e9090d6f483ca4e742af2c7f2f83
 
 # pheidi
 pheidi_rollbar_token: 6fc422ac645441bea7f6f14853eb01ab
+pheidi_email_github_token: 115b4d854e34e8a5ba99ab73eefe4bf7a8944d6d
 
 # rabbit
 rabbit_host_address: "{{ hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address'] }}"
diff --git a/ansible/group_vars/alpha-api-base.yml b/ansible/group_vars/alpha-api-base.yml
@@ -4,6 +4,7 @@ node_version: 0.10.38
 npm_version: 2.8.3
 
 repo: git@github.com:CodeNow/api.git
+restart_policy: always
 
 # for sendGrid
 sendgrid_key: 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
@@ -42,6 +43,7 @@ api_base_container_envs: >-
   {% if api_new_relic_app_name is defined %} -e NEW_RELIC_LOG_LEVEL=fatal {% endif %}
   {% if api_new_relic_app_name is defined %} -e NEW_RELIC_NO_CONFIG_FILE=true {% endif %}
   -e NODE_ENV={{ node_env }}
+  -e NUM_WORKERS=1
   -e OPTIMUS_HOST=http://{{ optimus_hostname }}
   -e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
   -e RABBITMQ_PASSWORD={{ rabbit_password }}
diff --git a/ansible/group_vars/alpha-api.yml b/ansible/group_vars/alpha-api.yml
@@ -8,6 +8,8 @@ hosted_ports: [ "{{ api_port }}" ]
 redis_key: frontend:{{ api_hostname }}
 is_redis_update_required: yes
 
+memory_hard_limit: 1g
+
 # for container settings
 container_envs: >
   {{ api_base_container_envs }}
diff --git a/ansible/group_vars/alpha-ingress-proxy.yml b/ansible/group_vars/alpha-ingress-proxy.yml
@@ -0,0 +1,25 @@
+---
+name: nginx
+
+# used by consul template updater
+proxy_service_name: api
+target_container_name: nginx
+target_updater_file_path: /etc/nginx/sites-enabled
+template_command: /bin/docker kill -s HUP {{ target_container_name }}
+template_path: /etc/nginx/template/api.tmpl
+
+# used by container_kill_start
+container_image: "{{ name }}"
+container_tag: "1.10"
+
+restart_policy: always
+
+container_run_opts: >
+  -d
+  --name {{ name }}
+  -p 0.0.0.0:443:443
+  -p 0.0.0.0:80:80
+  -v /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+  -v {{ target_updater_file_path }}
+  -v /etc/ssl/certs/{{ domain }}:/etc/ssl/certs/{{ domain }}:ro
+  -v /var/log/nginx:/var/log/nginx
diff --git a/ansible/group_vars/alpha-khronos.yml b/ansible/group_vars/alpha-khronos.yml
@@ -50,7 +50,6 @@ container_envs: >
   -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
@@ -73,4 +72,4 @@ container_run_opts: >
   -v /opt/ssl/mongo-client:/opt/ssl/mongo-client:ro
   {{container_envs}}
 
-container_run_args: timeout 5h npm start
+container_run_args: timeout 1h npm start
diff --git a/ansible/group_vars/alpha-pheidi.yml b/ansible/group_vars/alpha-pheidi.yml
@@ -6,6 +6,9 @@ repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "4.2.2"
 npm_version: "2.14.7"
 
+# for sendGrid
+sendgrid_key: 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
+
 container_envs: >
   -e DATADOG_HOST={{ datadog_host_address }}
   -e DATADOG_PORT={{ datadog_port }}
@@ -18,12 +21,14 @@ container_envs: >
   -e RABBITMQ_PORT="{{ rabbit_port }}"
   -e RABBITMQ_USERNAME="{{ rabbit_username }}"
   -e ROLLBAR_KEY={{ pheidi_rollbar_token }}
+  -e EMAIL_GITHUB_ACCESS_TOKEN={{ pheidi_email_github_token }}
   -e RUNNABOT_GITHUB_ACCESS_TOKENS={{ pheidi_runnabot_tokens }}
   {% if node_env != "production-epsilon" %} -e MONGO_CACERT=/opt/ssl/mongo-client/ca.pem {% endif %}
   {% if node_env != "production-epsilon" %} -e MONGO_CERT=/opt/ssl/mongo-client/cert.pem {% endif %}
   {% if node_env != "production-epsilon" %} -e MONGO_KEY=/opt/ssl/mongo-client/key.pem {% endif %}
   -e MONGO_REPLSET_NAME={{ pheidi_mongo_replset_name }}
   -e MONGO=mongodb://{{ pheidi_mongo_auth }}@{{ mongo_hosts }}/{{ pheidi_mongo_database }}
+  -e SENDGRID_KEY={{ sendgrid_key }}
   -e USER_CONTENT_DOMAIN={{ user_content_domain }}
   -e WEB_URL=https://app.{{ domain }}
 
diff --git a/ansible/group_vars/alpha-swarm-daemon.yml b/ansible/group_vars/alpha-swarm-daemon.yml
@@ -2,7 +2,7 @@ name: "swarm-deamon"
 
 # container_kill_start settings
 container_image: swarm
-container_tag: 1.2.0
+container_tag: 1.2.3
 
 container_run_opts: >
   --name {{ swarm_container_name }}
diff --git a/ansible/group_vars/alpha-swarm-manager.yml b/ansible/group_vars/alpha-swarm-manager.yml
@@ -2,7 +2,7 @@ name: "swarm-manager"
 
 # container_kill_start settings
 container_image: swarm
-container_tag: 1.2.0-0
+container_tag: 1.2.3-0
 
 container_run_opts: >
   -d
diff --git a/ansible/group_vars/alpha-workers.yml b/ansible/group_vars/alpha-workers.yml
@@ -6,7 +6,6 @@ container_image: registry.runnable.com/runnable/{{ name }}
 container_envs: >
   {{ api_base_container_envs }}
   -e IS_QUEUE_WORKER=true
-  -e NUM_WORKERS=1
   -e ROLLBAR_KEY={{ api_workers_rollbar_key }}
 
 container_run_opts: >
diff --git a/ansible/ingress-proxy.yml b/ansible/ingress-proxy.yml
@@ -0,0 +1,16 @@
+---
+- hosts: ingress
+  vars_files:
+  - group_vars/alpha-ingress-proxy.yml
+  roles:
+  - role: datadog
+    has_dd_integration: yes
+
+  - role: runnable-domain-proxy
+
+  - role: container_kill_start
+
+- include: consul-template-updater.yml
+  vars:
+    host: ingress
+    var_file: alpha-ingress-proxy.yml
diff --git a/ansible/navi-proxy.yml b/ansible/navi-proxy.yml
@@ -12,4 +12,5 @@
 
 - include: consul-template-updater.yml
   vars:
+    host: userland
     var_file: alpha-navi-proxy.yml
diff --git a/ansible/registrator-api.yml b/ansible/registrator-api.yml
@@ -0,0 +1,11 @@
+---
+- hosts: consul
+
+- hosts: api
+  vars_files:
+  - group_vars/alpha-registrator.yml
+  roles:
+  - role: notify
+    tags: notify
+
+  - role: container_kill_start
diff --git a/ansible/registrator-navi.yml b/ansible/registrator-navi.yml
diff --git a/ansible/roles/container_kill_start/files/findTagRunning.sh b/ansible/roles/container_kill_start/files/findTagRunning.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 IMAGE_NAME="$1"
-CONTAINERS=`docker ps | grep -v '^CONTAINER' | awk '{print $1}'`
+CONTAINERS=`docker ps -a | grep -v '^CONTAINER' | awk '{print $1}'`
 
 if [ "" = "${CONTAINERS}" ] ; then
     exit 0
 else
     for container in ${CONTAINERS} ; do
-        docker inspect "${container}" | grep -q '"Image": "'"${IMAGE_NAME}":
+        docker inspect "${container}" 2>/dev/null| grep -q '"Image": "'"${IMAGE_NAME}": > /dev/null 2>&1
         if [ ${?} -eq 0 ] ; then
             if [ -z "${RUNNING_CONTAINERS}" ] ; then
                 RUNNING_CONTAINERS="${container}"
@@ -19,5 +19,5 @@ else
 fi
 
 if [ ! -z "${RUNNING_CONTAINERS}" ] ; then
-    echo "${RUNNING_CONTAINERS}"
+    echo "${RUNNING_CONTAINERS//['\t\r\n']}"
 fi
diff --git a/ansible/roles/container_kill_start/tasks/main.yml b/ansible/roles/container_kill_start/tasks/main.yml
@@ -22,7 +22,7 @@
   become: true
   script: findTagRunning.sh {{ container_image }}
   register: old_containers_id
-  changed_when: old_containers_id.stdout != ''
+  changed_when: old_containers_id.stdout | length > 4
 
 # get latest image
 # tag will default to latest
@@ -48,16 +48,14 @@
   tags: deploy
   when: old_containers_id.changed
   become: yes
-  command: docker stop -t {{ stop_time }} {{ item }}
-  with_items: "{{ old_containers_id.stdout_lines }}"
+  command: docker stop -t {{ stop_time }} {{ old_containers_id.stdout }}
 
 # remove the old containers that were running previously
 - name: remove old containers
   tags: deploy
   when: old_containers_id.changed
   become: yes
-  command: docker rm {{ item }}
-  with_items: "{{ old_containers_id.stdout_lines }}"
+  command: docker rm {{ old_containers_id.stdout }}
 
 - name: pause to allow for any odd conditions in system caching tables
   tags: deploy
@@ -68,16 +66,21 @@
 - name: start container
   tags: deploy
   become: yes
-  command: >
-    docker run
-    --log-driver={{ log_driver }}
-    --log-opt syslog-facility={{ log_facility }}
-    --log-opt tag="{{ log_tag | default ( name ) }}"
-    -v {{ app_log_dir }}:{{ app_log_dir }}:rw
-    --restart={{ restart_policy | default('always') }}
-    {{ container_run_opts }}
-    {{ container_image }}:{{ container_tag }}
-    {{ container_run_args }}
+  command: |
+    docker run \
+    {% if memory_hard_limit is defined %}
+      --memory {{ memory_hard_limit | default ( "1g" ) }} \
+    {% endif %}
+    --log-driver={{ log_driver }} \
+    {% if log_driver == "syslog" %}
+      --log-opt syslog-facility={{ log_facility }} \
+      --log-opt tag="{{ log_tag | default ( name ) }}" \
+    {% endif %}
+    -v {{ app_log_dir }}:{{ app_log_dir }}:rw \
+    --restart={{ restart_policy | default('always') }} \
+    {{ container_run_opts | trim }} \
+    {{ container_image }}:{{ container_tag }} \
+    {{ container_run_args | trim }}
   register: new_container_id
   notify:
     - get new container ports
diff --git a/ansible/roles/container_start/tasks/main.yml b/ansible/roles/container_start/tasks/main.yml
@@ -39,9 +39,14 @@
   shell: |
     for i in {{ '{' }}1..{{ number_of_containers }}{{ '}' }}; do
       docker run \
+        {% if memory_hard_limit is defined %}
+          --memory {{ memory_hard_limit }} \
+        {% endif %}
         --log-driver={{ log_driver }} \
-        --log-opt syslog-facility={{ log_facility }} \
-        --log-opt tag="{{ log_tag | default ( name ) }}" \
+        {% if log_driver == "syslog" %}
+          --log-opt syslog-facility={{ log_facility }} \
+          --log-opt tag="{{ log_tag | default ( name ) }}" \
+        {% endif %}
         -v {{ app_log_dir }}:{{ app_log_dir }}:rw \
         -v /dev/log:/dev/log:rw \
         --restart={{ restart_policy | default('no') }} \
diff --git a/ansible/roles/datadog/templates/docker_daemon.yaml.j2 b/ansible/roles/datadog/templates/docker_daemon.yaml.j2
@@ -2,5 +2,11 @@ init_config:
 
 instances:
   - url: "unix://var/run/docker.sock"
+
     collect_labels_as_tags: ["instanceName"]
-    
+
+    collect_container_size: false
+
+    performance_tags: ["container_id", "image_name", "image_tag"]
+
+    container_tags: ["image_name", "image_tag"]
diff --git a/ansible/roles/runnable-domain-proxy/tasks/main.yml b/ansible/roles/runnable-domain-proxy/tasks/main.yml
diff --git a/ansible/roles/runnable-domain-proxy/templates/api.tmpl b/ansible/roles/runnable-domain-proxy/templates/api.tmpl
diff --git a/ansible/roles/runnable-domain-proxy/templates/proxy-nginx.conf b/ansible/roles/runnable-domain-proxy/templates/proxy-nginx.conf
diff --git a/ssh/config b/ssh/config
