summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-21 18:01:06 +0000
committerGerrit Code Review <review@openstack.org>2012-02-21 18:01:06 +0000
commitadaf9049c8fb3652c0962909a3c835e1724d8a17 (patch)
treef4bf3533cd0efbf40c85c84f770881236974b2ad /etc
parent0774865a2f6d92052bfa71bdac9585d24216085a (diff)
parent49eefc85977a81cd34f383884c8fc20eca6e675a (diff)
Merge "Update api-paste.ini with new auth_token settings."
Diffstat (limited to 'etc')
-rw-r--r--etc/nova/api-paste.ini5
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini
index fe11b1d41..861bd3d57 100644
--- a/etc/nova/api-paste.ini
+++ b/etc/nova/api-paste.ini
@@ -150,5 +150,8 @@ auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/
-# NOTE(vish): you will have to replace the value below with an actual admin token
+# NOTE: you will have to replace the values below with an actual token
+# or user:password combination.
+# admin_user = %SERVICE_USER%
+# admin_password = %SERVICE_PASSWORD%
admin_token = %SERVICE_TOKEN%