Juju Charms Collection
swift-proxy package

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

  1. Precise Pangolin (12.04)
  2. delay_auth
  3. Merge into ha-support
Proposed by Adam Gandelman
Status: Merged
Merged at revision: 48
Proposed branch: lp:~gandelman-a/charms/precise/swift-proxy/delay_auth
Merge into: lp:~openstack-charmers/charms/precise/swift-proxy/ha-support
Diff against target: 57 lines (+9/-2)
5 files modified
config.yaml (+4/-0)
hooks/swift_utils.py (+2/-1)
revision (+1/-1)
templates/essex/proxy-server.conf (+1/-0)
templates/grizzly/proxy-server.conf (+1/-0)
To merge this branch: bzr merge lp:~gandelman-a/charms/precise/swift-proxy/delay_auth
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+158269@code.launchpad.net

Description of the change

Adds optional delay_auth_decision config option, which defaults to True. Must be enabled for container ACLs to work /w Keystone, which is required for Juju's osapi swift provider to function

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

LGTM - merge away please.

review: Approve

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-03-12 13:33:31 +0000
3+++ config.yaml 2013-04-11 04:33:24 +0000
4@@ -102,6 +102,10 @@
5 default: tempauth
6 type: string
7 description: Auth method to use, tempauth or keystone
8+ delay-auth-decision:
9+ default: "True"
10+ type: string
11+ description: Delay authentication to downstream WSGI services.
12 # Manual Keystone configuration.
13 keystone-auth-host:
14 type: string
15
16=== modified file 'hooks/swift_utils.py'
17--- hooks/swift_utils.py 2013-03-12 21:52:51 +0000
18+++ hooks/swift_utils.py 2013-04-11 04:33:24 +0000
19@@ -196,7 +196,8 @@
20 'proxy_ip': utils.get_host_ip(),
21 'bind_port': cluster.determine_api_port(bind_port),
22 'workers': workers,
23- 'operator_roles': utils.config_get('operator-roles')
24+ 'operator_roles': utils.config_get('operator-roles'),
25+ 'delay_auth_decision': utils.config_get('delay-auth-decision')
26 }
27
28 ctxt['ssl'] = False
29
30=== modified file 'revision'
31--- revision 2013-04-10 19:54:18 +0000
32+++ revision 2013-04-11 04:33:24 +0000
33@@ -1,1 +1,1 @@
34-125
35+126
36
37=== modified file 'templates/essex/proxy-server.conf'
38--- templates/essex/proxy-server.conf 2012-12-14 23:07:01 +0000
39+++ templates/essex/proxy-server.conf 2013-04-11 04:33:24 +0000
40@@ -45,6 +45,7 @@
41 admin_tenant_name = {{ service_tenant }}
42 admin_user = {{ service_user }}
43 admin_password = {{ service_password }}
44+delay_auth_decision = {{ delay_auth_decision }}
45 {% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
46
47
48
49=== modified file 'templates/grizzly/proxy-server.conf'
50--- templates/grizzly/proxy-server.conf 2013-01-29 00:41:52 +0000
51+++ templates/grizzly/proxy-server.conf 2013-04-11 04:33:24 +0000
52@@ -45,6 +45,7 @@
53 admin_tenant_name = {{ service_tenant }}
54 admin_user = {{ service_user }}
55 admin_password = {{ service_password }}
56+delay_auth_decision = {{ delay_auth_decision }}
57 {% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
58
59

Subscribers

People subscribed via source and target branches