update proxy for navi

Author: Anandkumar Patel

ansible/group_vars/alpha-navi.yml

@@ -3,7 +3,7 @@ name: navi
 container_image: registry.runnable.com/runnable/{{ name }}
 container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/{{ name }}.git
-hosted_ports: [ "{{ navi_http_port }}", "{{ navi_https_port }}" ]
+hosted_ports: [ "{{ navi_http_port }}" ]
 node_version: "4.2.4"
 npm_version: "2.8.3"
 
@@ -21,7 +21,6 @@ container_envs: >
   -e ENABLE_LRU_CACHE=1
   -e ERROR_URL=http://{{ detention_host_address }}:{{ detention_port }}
   -e HTTP_PORT={{ hosted_ports[0] }}
-  -e HTTPS_PORT={{ hosted_ports[1] }}
   -e LOG_LEVEL_STDOUT=trace
   -e MONGO=mongodb://{{ navi_mongo_host_address }}:{{ navi_mongo_port }}/{{ navi_mongo_database }}
   -e NODE_ENV={{ node_env }}
@@ -32,7 +31,6 @@ container_envs: >
   -e REDIS_CACERT={{ redis_ca_cert_path }}
   -e REDIS_IPADDRESS={{ redis_host_address }}
   -e REDIS_PORT={{ redis_tls_port }}
-  -e USERLAND_IP={{ userland_host_address }}
   {% if navi_intercom_api_key is defined %} -e INTERCOM_API_KEY={{ navi_intercom_api_key }} {% endif %}
   {% if navi_intercom_app_id is defined %} -e INTERCOM_APP_ID={{ navi_intercom_app_id }} {% endif %}
   {% if navi_new_relic_app_name is defined %} -e NEW_RELIC_APP_NAME={{ navi_new_relic_app_name }} {% endif %}
@@ -43,8 +41,7 @@ container_envs: >
 container_run_opts: >
   -h {{ name }}
   -d
-  -p {{ hosted_ports[0] }}:{{ hosted_ports[0] }}
-  -p {{ hosted_ports[1] }}:{{ hosted_ports[1] }}
+  -P
   -v {{ redis_ca_cert_path }}:{{ redis_ca_cert_path }}
   -v {{ content_domain_certs }}:{{ content_domain_certs }}
   {{ container_envs }}

ansible/navi.yml

@@ -16,4 +16,9 @@
   - { role: builder, tags: [ build ] }
   - { role: content-domain-certs }
   - { role: tls-server-ca, ca_dest: "{{ redis_ca_cert_path }}" }
-  - { role: container_kill_start }
+  - { role: container_start, number_of_containers: 2 }
+  - role: nginx-proxied-service
+    nginx_host: "{{ groups['userland'][0] }}"
+    target_ip_address: "{{ hostvars[groups['navi'][0]]['ansible_default_ipv4']['address'] }}"
+    templates: [ 01-navi.conf ]
+    nginx_config: proxy

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

@@ -1,30 +1,20 @@
 ---
 # 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
+    for c in $(docker ps | awk '/{{ name }}/{ print $1 }'); do
+      {% if hosted_ports is defined %}
+        {% for hosted_port in hosted_ports %}
+        docker port $c {{ hosted_port }} | cut -d ':' -f 2
+        {% endfor %}
+      {% endif %}
     done
   args:
     executable: /bin/bash
-  register: socket_target_ports
+  register: proxy_target_ports
 
 # everything from this point on is deligated to the nginx host
 
@@ -33,8 +23,7 @@
   tags: [ configure_proxy, deploy ]
   debug:
     msg: |
-      eru ports -- {{ eru_target_ports }}
-      socket ports -- {{ socket_target_ports }}
+      proxy target ports -- {{ proxy_target_ports }}
 
 - name: print target IP address
   delegate_to: "{{ nginx_host }}"
@@ -66,6 +55,15 @@
     state: directory
     dest: /etc/nginx/sites-enable
 
+- name: put nginx configuration in place
+  when: nginx_config is defined and nginx_config == "proxy"
+  delegate_to: "{{ nginx_host }}"
+  tags: [ configure_proxy, deploy ]
+  become: yes
+  template:
+    src: "{{ nginx_config }}-nginx.conf"
+    dest: /etc/nginx/nginx.conf
+
 - name: put configuration in place
   delegate_to: "{{ nginx_host }}"
   tags: [ configure_proxy, deploy ]

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 socket_target_ports.stdout_lines -%}
+  {% for port in proxy_target_ports.stdout_lines -%}
   server {{ target_ip_address }}:{{ port }};
   {% endfor %}
 }

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

@@ -39,7 +39,7 @@ server {
 
   location / {
     expires 300;
-    proxy_pass http://{{ target_ip_address }}:{{ eru_target_ports.stdout_lines[0] | trim }};
+    proxy_pass http://{{ target_ip_address }}:{{ proxy_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;
@@ -48,7 +48,7 @@ server {
   }
 
   location /graphql {
-    proxy_pass http://{{ target_ip_address }}:{{ eru_target_ports.stdout_lines[1] | trim }};
+    proxy_pass http://{{ target_ip_address }}:{{ proxy_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;