Merge branch 'public-tcp-endpoints-different-port' into 'master'

Support forwarding to different internal port in public_tcp_endpoints

See merge request ai3/float!248

roles/float-infra-haproxy/templates/firewall/20haproxy.j2

@@ -5,7 +5,7 @@
 allow_port tcp {{ port }}
 {% endfor %}
 {% else %}
-allow_port tcp {{ ep.port }}
+allow_port tcp {{ ep.public_port | default(ep.port) }}
 {% endif %}
 {% endfor %}
 {% endfor %}

roles/float-infra-haproxy/templates/haproxy.cfg.j2

@@ -47,11 +47,11 @@ backend be_{{ service_name }}_{{ ep.name }}_{{ port }}
 {% endfor %} # ep.ports
 
 {% else %}
-frontend fe_{{ service_name }}_{{ ep.name }}_{{ ep.port }}
-        bind :::{{ ep.port }}
+{% set public_port = ep.public_port | default(ep.port) %}
+frontend fe_{{ service_name }}_{{ ep.name }}_{{ public_port }}
+        bind :::{{ public_port }}
         default_backend be_{{ service_name }}_{{ ep.name }}_{{ ep.port }}
 
-
 backend be_{{ service_name }}_{{ ep.name }}_{{ ep.port }}
         log global
         balance leastconn