From 7b9cc594a3b8e6f9fa7214a52b06894541a81490 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Fri, 26 Jun 2015 12:52:48 +0100 Subject: [PATCH] Make swift_proxy_vars not a required variable The swift_proxy_vars settings per swift-proxy_hosts entry should not be a required variable. This patch ensures that if it isn't specified the plays will still run as normal. Change-Id: I0ce8c3781c6fccb0fd757498222d1dab6124313f Closes-Bug: #1469134 --- templates/proxy-server.conf.j2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/proxy-server.conf.j2 b/templates/proxy-server.conf.j2 index b3563353..af34dc3f 100644 --- a/templates/proxy-server.conf.j2 +++ b/templates/proxy-server.conf.j2 @@ -23,13 +23,15 @@ log_facility = LOG_LOCAL1 node_timeout = 60 conn_timeout = 3.5 account_autocreate = true -{% if swift_proxy_vars.read_affinity is defined %} +{% if swift_proxy_vars is defined %} +{% if swift_proxy_vars.read_affinity is defined %} read_affinity = {{ swift_proxy_vars.read_affinity }} -{% endif %} -{% if swift_proxy_vars.write_affinity is defined %} +{% endif %} +{% if swift_proxy_vars.write_affinity is defined %} write_affinity = {{ swift_proxy_vars.write_affinity }} -{% if swift_proxy_vars.write_affinity_node_count is defined %} +{% if swift_proxy_vars.write_affinity_node_count is defined %} write_affinity_node_count = {{ swift_proxy_vars.write_affinity_node_count }} +{% endif %} {% endif %} {% endif %}