summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2012-03-07 18:05:49 -0500
committerDan Prince <dprince@redhat.com>2012-03-07 18:05:49 -0500
commit90dc29f384c6f7f41bcef507bc51e59aa4618a6e (patch)
tree61c8573f69213999fbd2c2342f35402e00a3698b
parent70f0ea588e9b0ddf47c15531b86e81aa59556199 (diff)
downloadnova-90dc29f384c6f7f41bcef507bc51e59aa4618a6e.tar.gz
nova-90dc29f384c6f7f41bcef507bc51e59aa4618a6e.tar.xz
nova-90dc29f384c6f7f41bcef507bc51e59aa4618a6e.zip
Update paste file to use service tenant.
Update the keystone section of api-paste.ini with example settings for the keystone service tenant. Removed the admin_token example line. Change-Id: If4ec08ec1f1882347a1b0842e65b665fccbcaeaa
-rw-r--r--etc/nova/api-paste.ini8
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini
index 98cd8f030..3ef3a8bd8 100644
--- a/etc/nova/api-paste.ini
+++ b/etc/nova/api-paste.ini
@@ -148,8 +148,6 @@ auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/
-# 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%
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%