Updated templates to allow to not create upstreams (#6)

hellofresh · Apr 6, 2018 · 28f0fd6 · 28f0fd6
1 parent fcb0157
commit 28f0fd6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/templates/locations.j2 b/templates/locations.j2
@@ -12,7 +12,7 @@
 {% set combined_config = config_block %}
 {% endif %}
 {% for key, value in combined_config.iteritems() %}
-{% if key not in ['proxy_pass', 'path', 'server'] %}
+{% if key not in ['proxy_pass', 'path', 'server', 'no_upstream'] %}
 {% if value is iterable and value is not string %}
 {% for array_value in value %}
     {{ key }} {{ array_value }};

diff --git a/templates/upstreams.j2 b/templates/upstreams.j2
@@ -7,6 +7,8 @@
 {% set _ = data.update({config_block.proxy_pass: "1"}) %}
   upstream {{ config_block.proxy_pass }} {
 {% if 'proxy_pass' in config_block  %}
+{% if 'no_upstream' in config_block and config_block.no_upstream == 'true' %}
+{% else %}
 {% if config_block.proxy_pass in consul_services%}
 {% if 'local_port' in consul_services[config_block.proxy_pass] %}
     server 127.0.0.1:{{ consul_services[config_block.proxy_pass]['local_port'] }};
@@ -19,5 +21,6 @@
 {% endif %}
   }
 {% endif %}
+{% endif %}
 {% endfor %}
 {% endif %}