From b70785769297227806d18bd0457b72e4db6bc0e8 Mon Sep 17 00:00:00 2001 From: Rowcliffe Browne Date: Fri, 15 Jan 2016 17:34:05 +0800 Subject: [PATCH] Allow omission of 'port' and 'check' from server params useful for services that require more than 1 port mapped through (eg passive ftp) --- haproxy/templates/haproxy.jinja | 4 ++-- pillar.example | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/haproxy/templates/haproxy.jinja b/haproxy/templates/haproxy.jinja index 9f7a2f5..ed0a689 100644 --- a/haproxy/templates/haproxy.jinja +++ b/haproxy/templates/haproxy.jinja @@ -308,7 +308,7 @@ listen {{ listener.get('name', listener_name) }} {%- endif %} {%- if 'servers' in listener %} {%- for server_name, server in listener.servers|dictsort %} - server {{ server.get('name', server_name) }} {{ server.host }}:{{ server.port }} {{ server.check }} {{ server.get('extra', '') }} + server {{ server.get('name', server_name) }} {{ server.host }}{% if 'port' in server %}:{{ server.port }}{% endif %} {{ server.get('check', '') }} {{ server.get('extra', '') }} {%- endfor %} {%- endif %} {% endfor %} @@ -502,7 +502,7 @@ backend {{ backend.get('name', backend_name) }} {%- endif %} {%- if 'servers' in backend %} {%- for server_name, server in backend.servers|dictsort %} - server {{ server.get('name', server_name) }} {{ server.host }}:{{ server.port }} {{ server.check }} {{ server.get('extra', '') }} + server {{ server.get('name', server_name) }} {{ server.host }}{% if 'port' in server %}:{{ server.port }}{% endif %} {{ server.get('check', '') }} {{ server.get('extra', '') }} {%- endfor %} {%- endif %} {% endfor %} diff --git a/pillar.example b/pillar.example index 4c5a201..28222f7 100644 --- a/pillar.example +++ b/pillar.example @@ -103,6 +103,8 @@ haproxy: host: web2.example.com port: 18888 check: check + web3: + host: web3.example.com frontends: frontend1: @@ -163,6 +165,8 @@ haproxy: host: 123.156.189.111 port: 8080 check: check + another-server: + host: 123.156.189.112 api-backend: options: - http-server-close