From c1dd0530ff33eb3bcc18151e8ec2c6d974a460c4 Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Wed, 5 Jul 2017 16:00:06 -0700 Subject: [PATCH 1/2] use multiport navi --- ansible/group_vars/alpha-navi-proxy.yml | 3 ++- ansible/roles/content-domain-proxy/templates/navi.tmpl | 3 +++ environments/gamma/main.yml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/alpha-navi-proxy.yml b/ansible/group_vars/alpha-navi-proxy.yml index a69e9957..777068a7 100644 --- a/ansible/group_vars/alpha-navi-proxy.yml +++ b/ansible/group_vars/alpha-navi-proxy.yml @@ -3,7 +3,8 @@ name: navi-proxy container_image: "nginx" container_tag: "1.10" -hosted_ports: ["80", "443"] +base_ports: +hosted_ports: "{{ navi_extra_ports + [80, 443] }}" service_type: "LoadBalancer" container_run_args: '' diff --git a/ansible/roles/content-domain-proxy/templates/navi.tmpl b/ansible/roles/content-domain-proxy/templates/navi.tmpl index 7dfb2992..f2f7725d 100644 --- a/ansible/roles/content-domain-proxy/templates/navi.tmpl +++ b/ansible/roles/content-domain-proxy/templates/navi.tmpl @@ -27,6 +27,9 @@ data: server { listen 80; +{% for port in navi_extra_ports %} + listen {{ port }}; +{% endfor %} client_max_body_size 200m; server_name {{ user_content_domain }}; access_log /var/log/nginx/navi.access.log; diff --git a/environments/gamma/main.yml b/environments/gamma/main.yml index 17418be5..66500eb4 100644 --- a/environments/gamma/main.yml +++ b/environments/gamma/main.yml @@ -99,6 +99,7 @@ mongo_volume_id: vol-0daf05c3686a7e0a8 navi_mongo_hosts: mongo navi_mongo_password: 3f5210b8-8fe3-11e5-8e62-07b6eff19ecb navi_cookie_secret: c90e5fb4e7e511e597309a79f06e9478 +navi_extra_ports: [8080, 8000, 3000, 8001] optimus_aws_access_id: AKIAJPA2ZYSVVA5V7XXQ optimus_aws_secret_id: 5V70AUxfIyHeLvlYZe0xaYevDAdgTOWOn5G7nHlt From d0e710c9f8b96ce1ec2708c29c961d22bd4250ad Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Wed, 5 Jul 2017 16:58:44 -0700 Subject: [PATCH 2/2] update ports --- ansible/group_vars/all.yml | 1 + ansible/group_vars/alpha-navi-proxy.yml | 2 +- environments/gamma/main.yml | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index d2a24422..c5020dd0 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -182,6 +182,7 @@ metabase_port: 3000 mongo_storage_size_gb: 50 # navi +navi_extra_ports: [11211,15672,25672,27017,29015,3000,3001,3306,4000,4607,5000,5200,5400,5432,6379,6969,8000,8080,9000,9292,9300] navi_host_address: navi navi_http_port: 3567 navi_mongo_hosts: "mongo" diff --git a/ansible/group_vars/alpha-navi-proxy.yml b/ansible/group_vars/alpha-navi-proxy.yml index 777068a7..ea613d66 100644 --- a/ansible/group_vars/alpha-navi-proxy.yml +++ b/ansible/group_vars/alpha-navi-proxy.yml @@ -3,7 +3,7 @@ name: navi-proxy container_image: "nginx" container_tag: "1.10" -base_ports: + hosted_ports: "{{ navi_extra_ports + [80, 443] }}" service_type: "LoadBalancer" diff --git a/environments/gamma/main.yml b/environments/gamma/main.yml index 66500eb4..17418be5 100644 --- a/environments/gamma/main.yml +++ b/environments/gamma/main.yml @@ -99,7 +99,6 @@ mongo_volume_id: vol-0daf05c3686a7e0a8 navi_mongo_hosts: mongo navi_mongo_password: 3f5210b8-8fe3-11e5-8e62-07b6eff19ecb navi_cookie_secret: c90e5fb4e7e511e597309a79f06e9478 -navi_extra_ports: [8080, 8000, 3000, 8001] optimus_aws_access_id: AKIAJPA2ZYSVVA5V7XXQ optimus_aws_secret_id: 5V70AUxfIyHeLvlYZe0xaYevDAdgTOWOn5G7nHlt