Juju Charms Collection
swift-proxy package

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

  1. Precise Pangolin (12.04)
  2. essex_fix
  3. Merge into ha-support
Proposed by Adam Gandelman
Status: Merged
Merged at revision: 51
Proposed branch: lp:~gandelman-a/charms/precise/swift-proxy/essex_fix
Merge into: lp:~openstack-charmers/charms/precise/swift-proxy/ha-support
Diff against target: 24 lines (+9/-1)
2 files modified
revision (+1/-1)
templates/essex/proxy-server.conf (+8/-0)
To merge this branch: bzr merge lp:~gandelman-a/charms/precise/swift-proxy/essex_fix
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+161741@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'revision'
2--- revision 2013-04-26 21:12:55 +0000
3+++ revision 2013-04-30 23:51:31 +0000
4@@ -1,1 +1,1 @@
5-128
6+129
7
8=== modified file 'templates/essex/proxy-server.conf'
9--- templates/essex/proxy-server.conf 2013-04-15 20:22:07 +0000
10+++ templates/essex/proxy-server.conf 2013-04-30 23:51:31 +0000
11@@ -45,7 +45,15 @@
12 admin_tenant_name = {{ service_tenant }}
13 admin_user = {{ service_user }}
14 admin_password = {{ service_password }}
15+{% if os_release == 'essex' %}
16+{% if delay_auth_decision|lower == 'true' %}
17+delay_auth_decision = 1
18+{% else %}
19+delay_auth_decision = 0
20+{% endif %}
21+{% else %}
22 delay_auth_decision = {{ delay_auth_decision|lower }}
23+{% endif %}
24 {% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
25
26

Subscribers

People subscribed via source and target branches