openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Make swift_proxy_vars not a required variable

Browse Source 
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
This commit is contained in:
Andy McCrae 2015-06-26 12:52:48 +01:00
parent 858a733f73
commit 7b9cc594a3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/proxy-server.conf.j2
View File

@ -23,6 +23,7 @@ log_facility = LOG_LOCAL1
node_timeout = 60 node_timeout = 60
conn_timeout = 3.5 conn_timeout = 3.5
account_autocreate = true account_autocreate = true
{% if swift_proxy_vars is defined %}
{% if swift_proxy_vars.read_affinity is defined %} {% if swift_proxy_vars.read_affinity is defined %}
read_affinity = {{ swift_proxy_vars.read_affinity }} read_affinity = {{ swift_proxy_vars.read_affinity }}
{% endif %} {% endif %}
@ -32,6 +33,7 @@ write_affinity = {{ swift_proxy_vars.write_affinity }}
write_affinity_node_count = {{ swift_proxy_vars.write_affinity_node_count }} write_affinity_node_count = {{ swift_proxy_vars.write_affinity_node_count }}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %}
[filter:tempauth] [filter:tempauth]
use = egg:swift#tempauth use = egg:swift#tempauth