Add graphql port for Eru, add multiple upstreams for services in nginx ingress proxy.

Author: tosih

ansible/group_vars/all.yml

@@ -131,6 +131,7 @@ aws_region: "us-west-2"
 
 # eru
 eru_http_port: 5501
+eru_graphql_port: 5502
 
 # fluffy
 fluffy_port: 80

ansible/group_vars/alpha-eru.yml

@@ -36,6 +36,10 @@ container_envs:
     value: "{{ big_poppa_host_address }}:{{ big_poppa_port }}"
   - name: CONSUL_HOST
     value: "{{ consul_host_address }}:{{ consul_api_port }}"
+  - name: DATADOG_HOST
+    valueFrom: "spec.nodeName"
+  - name: DATADOG_PORT
+    value: "{{ datadog_port }}"
   - name: DOMAIN
     value: "{{ eru_subdomain }}.{{ domain }}"
   - name: GITHUB_CLIENT_ID

ansible/group_vars/alpha-ingress-proxy.yml

@@ -24,14 +24,14 @@ volume_mounts:
 
 services:
   - name: api
-    port: "{{ api_port }}"
+    ports: ["{{ api_port }}"]
   - name: drake
-    port: "{{ drake_port }}"
+    ports: ["{{ drake_port }}"]
   - name: optimus
-    port: "{{ optimus_port }}"
+    ports: ["{{ optimus_port }}"]
   - name: apisock
-    port: "{{ api_port }}"
+    ports: ["{{ api_port }}"]
   - name: eru
-    port: "{{ eru_http_port }}"
+    ports: ["{{ eru_http_port }}","{{ eru_graphql_port }}"]
   - name: egret
-    port: "{{ egret_port }}"
+    ports: ["{{ egret_port }}"]

ansible/roles/runnable-domain-proxy/templates/sites-enabled.tmpl

@@ -64,7 +64,9 @@ data:
     }
 
     upstream {{ service.name }} {
-      server {{ service.name }}:{{ service.port }} max_fails=0 fail_timeout=1s;
+      {% for port in service.ports %}
+      server {{ service.name }}:{{ port }} max_fails=0 fail_timeout=1s;
+      {% endfor %}
     }
 
     server {