fixes for vars and hosts

Author: Bryan Kendall

ansible/eru.yml

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

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

@@ -2,7 +2,7 @@
 # these are pretty hacky, but it should work
 # Get port information from the hosted service
 - name: get eru ports
-  when: "{{ name }} == eru"
+  when: name == "eru"
   tags: [ configure_proxy, deploy ]
   become: true
   shell: |
@@ -12,10 +12,10 @@
     done
   args:
     executable: /bin/bash
-  register: target_ports
+  register: eru_target_ports
 
 - name: get socket server ports
-  when: "{{ name }} == api-socket-server"
+  when: name == "api-socket-server"
   tags: [ configure_proxy, deploy ]
   become: true
   shell: |
@@ -24,15 +24,17 @@
     done
   args:
     executable: /bin/bash
-  register: target_ports
+  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: ports -- {{ target_ports }}
+    msg: |
+      eru ports -- {{ eru_target_ports }}
+      socket ports -- {{ socket_target_ports }}
 
 - name: print target IP address
   delegate_to: "{{ nginx_host }}"

ansible/roles/nginx-proxied-service/templates/01-socket-server.conf

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

ansible/roles/nginx-proxied-service/templates/11-eru-server.conf

@@ -35,7 +35,7 @@ server {
 
   location / {
     expires 300;
-    proxy_pass http://{{ target_ip_address }}:{{ target_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://{{ target_ip_address }}:{{ target_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;

ansible/socket-server.yml

@@ -7,6 +7,7 @@
 - hosts: redis
 - hosts: swarm-manager
 - hosts: consul
+- hosts: socket-server-proxy
 
 - hosts: socket-server
   vars_files:
@@ -23,6 +24,6 @@
   - { role: datadog, tags: [ datadog ] }
   - { role: container_start, number_of_containers: 8 }
   - role: nginx-proxied-service
-    nginx_host: "{{ groups['api-socket-proxy'][0] }}"
-    target_ip_address: "{{ groups['socket-server'][0].ansible_default_ipv4.address }}"
+    nginx_host: "{{ groups['socket-server-proxy'][0] }}"
+    target_ip_address: "{{ hostvars[groups['socket-server'][0]]['ansible_default_ipv4']['address'] }}"
     templates: [ 01-socket-server.conf ]