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
=== modified file 'config.yaml'
--- config.yaml 2013-04-11 04:27:47 +0000
+++ config.yaml 2013-04-15 20:36:26 +0000
@@ -103,8 +103,8 @@
103 type: string103 type: string
104 description: Auth method to use, tempauth or keystone104 description: Auth method to use, tempauth or keystone
105 delay-auth-decision:105 delay-auth-decision:
106 default: "True"106 default: true
107 type: string107 type: boolean
108 description: Delay authentication to downstream WSGI services.108 description: Delay authentication to downstream WSGI services.
109 # Manual Keystone configuration.109 # Manual Keystone configuration.
110 keystone-auth-host:110 keystone-auth-host:
111111
=== modified file 'templates/essex/proxy-server.conf'
--- templates/essex/proxy-server.conf 2013-04-11 04:27:47 +0000
+++ templates/essex/proxy-server.conf 2013-04-15 20:36:26 +0000
@@ -45,7 +45,7 @@
45admin_tenant_name = {{ service_tenant }}45admin_tenant_name = {{ service_tenant }}
46admin_user = {{ service_user }}46admin_user = {{ service_user }}
47admin_password = {{ service_password }}47admin_password = {{ service_password }}
48delay_auth_decision = {{ delay_auth_decision }}48delay_auth_decision = {{ delay_auth_decision|lower }}
49{% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}49{% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
5050
5151
5252
=== modified file 'templates/grizzly/proxy-server.conf'
--- templates/grizzly/proxy-server.conf 2013-04-11 04:27:47 +0000
+++ templates/grizzly/proxy-server.conf 2013-04-15 20:36:26 +0000
@@ -45,7 +45,7 @@
45admin_tenant_name = {{ service_tenant }}45admin_tenant_name = {{ service_tenant }}
46admin_user = {{ service_user }}46admin_user = {{ service_user }}
47admin_password = {{ service_password }}47admin_password = {{ service_password }}
48delay_auth_decision = {{ delay_auth_decision }}48delay_auth_decision = {{ delay_auth_decision|lower }}
49{% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}49{% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
5050
5151

Subscribers

People subscribed via source and target branches