diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini
index 98cd8f030d7e..3ef3a8bd82e9 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%