Merge branch 'master' into SAN-3496-json-logs

Author: Christopher M. Neill

.gitignore

@@ -10,3 +10,5 @@ ca.srl
 .DS_Store
 ansible/roles/hipache/templates/runnable*
 ansible/certs/*
+*.retry
+

ansible/eru.yml

@@ -2,6 +2,7 @@
 - hosts: consul
 - hosts: mongodb
 - hosts: redis
+- hosts: socket-server-proxy
 
 - hosts: eru
   vars_files:
@@ -10,9 +11,7 @@
   - { role: notify, tags: [ notify ] }
   - { role: builder, tags: [ build ] }
   - role: container_start
-
-- hosts: socket-server-proxy
-  vars_files:
-  - group_vars/alpha-eru.yml
-  roles:
-  - role: eru
+  - role: nginx-proxied-service
+    nginx_host: "{{ groups['socket-server-proxy'][0] }}"
+    target_ip_address: "{{ hostvars[groups['eru'][0]]['ansible_default_ipv4']['address'] }}"
+    templates: [ 11-eru-server.conf ]

ansible/group_vars/alpha-eru.yml

@@ -6,7 +6,7 @@ container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/{{ name }}.git
 hosted_ports: [ "5501", "5502" ]
 node_version: lts
-npm_version: 2
+npm_version: 3
 has_shrinkwrap: true
 
 dockerfile_post_install_commands:

ansible/roles/eru/tasks/main.yml

@@ -21,7 +21,7 @@
   with_items:
   - name: Khronos CLI - Daily Cleanup
     minute: 13
-    hour: 1,7,13,19
+    hour: 1,4,7,10,13,16,19,22
     script: main-cron.sh
   - name: Khronos CLI - Canary
     minute: "*/5"

ansible/roles/khronos/tasks/main.yml

@@ -0,0 +1,97 @@
+---
+# these are pretty hacky, but it should work
+# Get port information from the hosted service
+- name: get eru ports
+  when: name == "eru"
+  tags: [ configure_proxy, deploy ]
+  become: true
+  shell: |
+    for c in $(docker ps | awk '/eru/{ print $1 }'); do
+      docker port $c 5501 | cut -d ':' -f 2
+      docker port $c 5502 | cut -d ':' -f 2
+    done
+  args:
+    executable: /bin/bash
+  register: eru_target_ports
+
+- name: get socket server ports
+  when: name == "api-socket-server"
+  tags: [ configure_proxy, deploy ]
+  become: true
+  shell: |
+    for c in $(docker ps | awk '/api-socket-server/{ print $1 }'); do
+      docker port $c 80 | cut -d ':' -f 2
+    done
+  args:
+    executable: /bin/bash
+  register: socket_target_ports
+
+# everything from this point on is deligated to the nginx host
+
+- name: print target ports
+  delegate_to: "{{ nginx_host }}"
+  tags: [ configure_proxy, deploy ]
+  debug:
+    msg: |
+      eru ports -- {{ eru_target_ports }}
+      socket ports -- {{ socket_target_ports }}
+
+- name: print target IP address
+  delegate_to: "{{ nginx_host }}"
+  tags: [ configure_proxy, deploy ]
+  debug:
+    msg: ip -- {{ target_ip_address }}
+
+- name: assert nginx config directory
+  delegate_to: "{{ nginx_host }}"
+  tags: [ configure_proxy, deploy ]
+  become: yes
+  file:
+    state: directory
+    dest: /etc/nginx
+
+- name: assert nginx sites-available directory
+  delegate_to: "{{ nginx_host }}"
+  tags: [ configure_proxy, deploy ]
+  become: yes
+  file:
+    state: directory
+    dest: /etc/nginx/sites-available
+
+- name: assert nginx sites-enable directory
+  delegate_to: "{{ nginx_host }}"
+  tags: [ configure_proxy, deploy ]
+  become: yes
+  file:
+    state: directory
+    dest: /etc/nginx/sites-enable
+
+- name: put configuration in place
+  delegate_to: "{{ nginx_host }}"
+  tags: [ configure_proxy, deploy ]
+  become: yes
+  template:
+    src: "{{ item }}"
+    dest: /etc/nginx/sites-available/{{ item }}
+  with_items: "{{ templates }}"
+
+- name: link configuration to enable
+  delegate_to: "{{ nginx_host }}"
+  tags: [ configure_proxy, deploy ]
+  become: yes
+  file:
+    state: link
+    dest: /etc/nginx/sites-enabled/{{ item }}
+    src: /etc/nginx/sites-available/{{ item }}
+  with_items: "{{ templates }}"
+
+- name: reload nginx
+  delegate_to: "{{ nginx_host }}"
+  tags: [ configure_proxy, deploy ]
+  become: yes
+  shell: >
+    docker ps |
+    awk '/nginx/{ print $1 }' |
+    xargs -n 1 docker kill --signal SIGHUP
+  args:
+    executable: /bin/bash

ansible/roles/nginx-proxied-service/tasks/main.yml

@@ -5,8 +5,8 @@ map $http_upgrade $connection_upgrade {
 
 upstream socketserver {
   sticky;
-  {% for port in ports.stdout_lines -%}
-  server {{ socket_server_hostname }}:{{ port }};
+  {% for port in socket_target_ports.stdout_lines -%}
+  server {{ target_ip_address }}:{{ port }};
   {% endfor %}
 }
 

…ket-proxy/templates/00-nginx-status.conf …d-service/templates/00-nginx-status.confansible/roles/socket-proxy/templates/00-nginx-status.conf renamed to ansible/roles/nginx-proxied-service/templates/00-nginx-status.conf ansible/roles/socket-proxy/templates/00-nginx-status.conf renamed to ansible/roles/nginx-proxied-service/templates/00-nginx-status.conf

@@ -35,7 +35,7 @@ server {
 
   location / {
     expires 300;
-    proxy_pass http://{{ eru_server_hostname }}:{{ ports.stdout_lines[0] | trim }};
+    proxy_pass http://{{ target_ip_address }}:{{ eru_target_ports.stdout_lines[0] | trim }};
     proxy_set_header Host $host;
     proxy_set_header x-real-ip $remote_addr;
     proxy_set_header x-forwarded-for $proxy_add_x_forwarded_for;
@@ -44,7 +44,7 @@ server {
   }
 
   location /graphql {
-    proxy_pass http://{{ eru_server_hostname }}:{{ ports.stdout_lines[1] | trim }};
+    proxy_pass http://{{ target_ip_address }}:{{ eru_target_ports.stdout_lines[1] | trim }};
     proxy_set_header Host $host;
     proxy_set_header x-real-ip $remote_addr;
     proxy_set_header x-forwarded-for $proxy_add_x_forwarded_for;