summaryrefslogtreecommitdiffstats
path: root/etc/nova
diff options
context:
space:
mode:
authorvladimir.p <vladimir@zadarastorage.com>2011-08-25 19:18:46 -0700
committervladimir.p <vladimir@zadarastorage.com>2011-08-25 19:18:46 -0700
commit8b4d46285b7f00a89bad6000fdc78cc2ab1d5608 (patch)
treec7756786f2fa32315cd15a59f3f3b09c10196254 /etc/nova
parent59e9adb8e2ef39474a04ead76975a1fc3f913550 (diff)
parente38ba3a6066de8499ea5cc8d1fb2e5daefbf336a (diff)
merged with rev.1499
Diffstat (limited to 'etc/nova')
-rw-r--r--etc/nova/api-paste.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini
index dafdef877..cd24efb13 100644
--- a/etc/nova/api-paste.ini
+++ b/etc/nova/api-paste.ini
@@ -26,7 +26,11 @@ pipeline = logrequest ec2noauth cloudrequest authorizer ec2executor
# pipeline = logrequest totoken authtoken keystonecontext cloudrequest authorizer ec2executor
[pipeline:ec2admin]
-pipeline = logrequest authenticate adminrequest authorizer ec2executor
+pipeline = logrequest ec2noauth adminrequest authorizer ec2executor
+# NOTE(vish): use the following pipeline for deprecated auth
+#pipeline = logrequest authenticate adminrequest authorizer ec2executor
+# NOTE(vish): use the following pipeline for keystone
+#pipeline = logrequest totoken authtoken keystonecontext adminrequest authorizer ec2executor
[pipeline:ec2metadata]
pipeline = logrequest ec2md