diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-08 18:18:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-08 18:18:54 +0000 |
| commit | 7b44ad2756dc47bdb7eaa5bda298b8f0d57aab47 (patch) | |
| tree | 07034750180655b92e62e615184893ec73e583c2 | |
| parent | be29164340c53f63552325fff144fd8f36ec46ef (diff) | |
| parent | 90dc29f384c6f7f41bcef507bc51e59aa4618a6e (diff) | |
| download | nova-7b44ad2756dc47bdb7eaa5bda298b8f0d57aab47.tar.gz nova-7b44ad2756dc47bdb7eaa5bda298b8f0d57aab47.tar.xz nova-7b44ad2756dc47bdb7eaa5bda298b8f0d57aab47.zip | |
Merge "Update paste file to use service tenant."
| -rw-r--r-- | etc/nova/api-paste.ini | 8 |
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% |