Skip to content

Commit a0a4917

Browse files
Add support for down parameter for upstreams (#278)
1 parent 63325aa commit a0a4917

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

molecule/common/playbook_template.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,10 @@
242242
address: unix:/var/run/control.unit.sock
243243
weight: 1
244244
health_check: max_fails=3 fail_timeout=5s
245+
backend_server_3:
246+
address: 0.0.0.0
247+
port: 8083
248+
down: true
245249
frontend:
246250
template_file: http/default.conf.j2
247251
conf_file_name: frontend_default.conf
@@ -378,3 +382,7 @@
378382
port: 8091
379383
weight: 1
380384
health_check: max_fails=1 fail_timeout=10s
385+
backend_server_2:
386+
address: 0.0.0.0
387+
port: 8092
388+
down: true

templates/http/default.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ upstream {{ item.value.upstreams[upstream].name }} {
1010
zone {{ item.value.upstreams[upstream].zone_name }} {{ item.value.upstreams[upstream].zone_size }};
1111
{% endif %}
1212
{% for server in item.value.upstreams[upstream].servers %}
13-
server {{ item.value.upstreams[upstream].servers[server].address }}{{(":" + item.value.upstreams[upstream].servers[server].port | string) if item.value.upstreams[upstream].servers[server].port is defined}} weight={{ item.value.upstreams[upstream].servers[server].weight | default("1") }} {{ item.value.upstreams[upstream].servers[server].health_check | default("") }};
13+
server {{ item.value.upstreams[upstream].servers[server].address }}{{(":" + item.value.upstreams[upstream].servers[server].port | string) if item.value.upstreams[upstream].servers[server].port is defined}} {% if item.value.upstreams[upstream].servers[server].down is defined and item.value.upstreams[upstream].servers[server].down %}down{% else %}weight={{ item.value.upstreams[upstream].servers[server].weight | default("1") }} {{ item.value.upstreams[upstream].servers[server].health_check | default("") }}{% endif %};
1414
{% endfor %}
1515
{% if item.value.upstreams[upstream].sticky_cookie %}
1616
sticky cookie srv_id expires=1h path=/;

templates/stream/default.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ upstream {{ item.value.upstreams[upstream].name }} {
88
{% endif %}
99
zone {{ item.value.upstreams[upstream].zone_name }} {{ item.value.upstreams[upstream].zone_size }};
1010
{% for server in item.value.upstreams[upstream].servers %}
11-
server {{ item.value.upstreams[upstream].servers[server].address }}:{{ item.value.upstreams[upstream].servers[server].port }} weight={{ item.value.upstreams[upstream].servers[server].weight|default("1") }} {{ item.value.upstreams[upstream].servers[server].health_check|default("") }};
11+
server {{ item.value.upstreams[upstream].servers[server].address }}{{(":" + item.value.upstreams[upstream].servers[server].port | string) if item.value.upstreams[upstream].servers[server].port is defined}} {% if item.value.upstreams[upstream].servers[server].down is defined and item.value.upstreams[upstream].servers[server].down %}down{% else %}weight={{ item.value.upstreams[upstream].servers[server].weight | default("1") }} {{ item.value.upstreams[upstream].servers[server].health_check | default("") }}{% endif %};
1212
{% endfor %}
1313
{% if item.value.upstreams[upstream].sticky_cookie is defined %}
1414
{% if item.value.upstreams[upstream].sticky_cookie %}

0 commit comments

Comments
 (0)