Merge lp:~gandelman-a/charms/precise/swift-proxy/essex_fix into lp:~openstack-charmers/charms/precise/swift-proxy/ha-support

[Adam Gandelman]

In essex, the KS middleware's delay_auth_decision flag expects 0/1 instead of true/false.

=== modified file 'revision'
--- revision	2013-04-26 21:12:55 +0000
+++ revision	2013-04-30 23:51:31 +0000
@@ -1,1 +1,1 @@
-128
+129
 
=== modified file 'templates/essex/proxy-server.conf'
--- templates/essex/proxy-server.conf	2013-04-15 20:22:07 +0000
+++ templates/essex/proxy-server.conf	2013-04-30 23:51:31 +0000
@@ -45,7 +45,15 @@
 admin_tenant_name = {{ service_tenant }}
 admin_user = {{ service_user }}
 admin_password = {{ service_password }}
+{% if os_release == 'essex' %}
+{% if delay_auth_decision|lower == 'true' %}
+delay_auth_decision = 1
+{% else %}
+delay_auth_decision = 0
+{% endif %}
+{% else %}
 delay_auth_decision = {{ delay_auth_decision|lower }}
+{% endif %}
 {% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}