Merge remote-tracking branch 'origin/master' into reset-registry.yml

Author: Bryan Kendall

ansible/base.yml

@@ -1,12 +1,22 @@
 ---
+- hosts: localhost
+  connection: local
+  tasks:
+  - fail: msg="`host` (target host) needs to be defined to run this role"
+    when: host is not defined
+
+  - add_host:
+      name={{ host }}
+      groups=dock
+
 - 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-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, tags: [loggly] }
+  - { role: build_essential }
+  - { role: docker, tags: [ docker ] }
+  - { role: datadog, tags: [ datadog ] }
+  - { role: ulimits, tags: [ ulimits ] }
+  - { role: loggly, tags: [ loggly, clean ] }
   - { role: node }

ansible/delta-hosts/hosts

@@ -99,7 +99,7 @@ delta-registry
 delta-dock-services
 
 [swarm-manager]
-delta-dock-services
+delta-swarm-manager
 
 [metis]
 delta-app-services

ansible/docker-listener.yml

@@ -1,6 +1,7 @@
 ---
 - hosts: rabbitmq
 - hosts: consul
+- hosts: swarm-manager
 
 - hosts: docker-listener
   vars_files:

ansible/group_vars/alpha-khronos.yml

@@ -42,7 +42,7 @@ 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=100
+  -e KHRONOS_PREFETCH=6
   -e LOG_LEVEL=error
   {% if node_env != "production-epsilon" %}
     -e MONGO_CACERT=/opt/ssl/mongo-client/ca.pem

ansible/roles/build_essential/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: install build essentials
   become: yes
   action: apt
-    pkg: build-essential
-    state: present
-    update_cache: yes
-    cache_valid_time: 604800
+    pkg=build-essential
+    state=latest
+    update_cache=yes
+    cache_valid_time=604800

ansible/roles/loggly/tasks/main.yml

@@ -47,6 +47,7 @@
     group=syslog
 
 - name: copy app config
+  when: name is defined
   tags: loggly
   become: true
   template:
@@ -70,6 +71,7 @@
   service: name=rsyslog state=stopped
 
 - name: clear rsyslog state file
+  when: name is defined
   tags: [loggly, deploy]
   become: true
   file:

ansible/roles/package-dock/tasks/main.yml

@@ -1,14 +1,22 @@
 ---
+- name: Install make
+  become: true
+  apt:
+    pkg=make
+    state=latest
+    update_cache=yes
+    cache_valid_time=604800
+
 - name: Install unzip
-  become: yes
+  become: true
   apt:
     pkg=unzip
     state=latest
     update_cache=yes
     cache_valid_time=604800
 
 - name: Install openjdk-7-jdk
-  become: yes
+  become: true
   apt:
     pkg=openjdk-7-jdk
     state=latest
@@ -32,7 +40,7 @@
     dest=/usr/local/bin
 
 - name: unzip vault_0.4.1_linux_amd64.zip
-  become: yes
+  become: true
   unarchive:
     src=/usr/local/bin/vault_0.4.1_linux_amd64.zip
     dest=/usr/local/bin

ansible/sauron.yml

@@ -1,6 +1,7 @@
 ---
 - hosts: rabbitmq
 - hosts: consul
+- hosts: swarm-manager
 
 - hosts: sauron
   vars_files:

ssh/config

@@ -197,6 +197,9 @@ Host delta-mongo-c
 Host delta-navi
   ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.6.41 22
 
+Host delta-swarm-manager
+  ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.4.40 22
+
 ################################################################################
 # Epsilon
 ################################################################################