Merge lp:~ahasenack/charms/precise/swift-proxy/swift-proxy-ha-fix-bool into lp:~openstack-charmers/charms/precise/swift-proxy/ha-support

Proposed by Andreas Hasenack
Status: Merged
Merged at revision: 49
Proposed branch: lp:~ahasenack/charms/precise/swift-proxy/swift-proxy-ha-fix-bool
Merge into: lp:~openstack-charmers/charms/precise/swift-proxy/ha-support
Diff against target: 38 lines (+4/-4)
3 files modified
config.yaml (+2/-2)
templates/essex/proxy-server.conf (+1/-1)
templates/grizzly/proxy-server.conf (+1/-1)
To merge this branch: bzr merge lp:~ahasenack/charms/precise/swift-proxy/swift-proxy-ha-fix-bool
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+159013@code.launchpad.net

Description of the change

This quick branch changes the delay-auth-decision configuration key to be a boolean type intead of string, and makes sure it's rendered as lowercase in the proxy-server.conf file otherwise it's not taken into account.

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 'config.yaml'
2--- config.yaml 2013-04-11 04:27:47 +0000
3+++ config.yaml 2013-04-15 20:36:26 +0000
4@@ -103,8 +103,8 @@
5 type: string
6 description: Auth method to use, tempauth or keystone
7 delay-auth-decision:
8- default: "True"
9- type: string
10+ default: true
11+ type: boolean
12 description: Delay authentication to downstream WSGI services.
13 # Manual Keystone configuration.
14 keystone-auth-host:
15
16=== modified file 'templates/essex/proxy-server.conf'
17--- templates/essex/proxy-server.conf 2013-04-11 04:27:47 +0000
18+++ templates/essex/proxy-server.conf 2013-04-15 20:36:26 +0000
19@@ -45,7 +45,7 @@
20 admin_tenant_name = {{ service_tenant }}
21 admin_user = {{ service_user }}
22 admin_password = {{ service_password }}
23-delay_auth_decision = {{ delay_auth_decision }}
24+delay_auth_decision = {{ delay_auth_decision|lower }}
25 {% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
26
27
28
29=== modified file 'templates/grizzly/proxy-server.conf'
30--- templates/grizzly/proxy-server.conf 2013-04-11 04:27:47 +0000
31+++ templates/grizzly/proxy-server.conf 2013-04-15 20:36:26 +0000
32@@ -45,7 +45,7 @@
33 admin_tenant_name = {{ service_tenant }}
34 admin_user = {{ service_user }}
35 admin_password = {{ service_password }}
36-delay_auth_decision = {{ delay_auth_decision }}
37+delay_auth_decision = {{ delay_auth_decision|lower }}
38 {% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
39
40

Subscribers

People subscribed via source and target branches