Merge lp:~dan-prince/nova/ec2_admin_noauth into lp:~hudson-openstack/nova/trunk

Proposed by Dan Prince
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1484
Merged at revision: 1491
Proposed branch: lp:~dan-prince/nova/ec2_admin_noauth
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 16 lines (+5/-1)
1 file modified
etc/nova/api-paste.ini (+5/-1)
To merge this branch: bzr merge lp:~dan-prince/nova/ec2_admin_noauth
Reviewer Review Type Date Requested Status
Devin Carlen (community) Approve
Brian Waldon (community) Approve
Review via email: mp+72647@code.launchpad.net

Description of the change

Update paste config so that EC2 admin API defaults to noauth.

To post a comment you must log in.
Revision history for this message
Brian Waldon (bcwaldon) wrote :

looks good

review: Approve
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/nova/api-paste.ini'
2--- etc/nova/api-paste.ini 2011-08-22 21:24:59 +0000
3+++ etc/nova/api-paste.ini 2011-08-24 03:06:28 +0000
4@@ -26,7 +26,11 @@
5 # pipeline = logrequest totoken authtoken keystonecontext cloudrequest authorizer ec2executor
6
7 [pipeline:ec2admin]
8-pipeline = logrequest authenticate adminrequest authorizer ec2executor
9+pipeline = logrequest ec2noauth adminrequest authorizer ec2executor
10+# NOTE(vish): use the following pipeline for deprecated auth
11+#pipeline = logrequest authenticate adminrequest authorizer ec2executor
12+# NOTE(vish): use the following pipeline for keystone
13+#pipeline = logrequest totoken authtoken keystonecontext adminrequest authorizer ec2executor
14
15 [pipeline:ec2metadata]
16 pipeline = logrequest ec2md