diff options
| author | Jamie Lennox <jamielennox@redhat.com> | 2014-08-06 18:24:05 +1000 |
|---|---|---|
| committer | Dirk Mueller <dirk@dmllr.de> | 2014-10-10 18:28:09 +0200 |
| commit | 08f83f543bc992ae8f2787fb405e58c33dadba73 (patch) | |
| tree | 1edae6c7e0510c3b6e06208b642df28422ccd576 | |
| parent | c0d90a580f87dbbf71e3a5d5c1b5cf8d7c7245b2 (diff) | |
| download | glance-08f83f543bc992ae8f2787fb405e58c33dadba73.tar.gz | |
Use identity_uri instead of older fragments2014.2.rc2
This has been the default option in middleware for a while now and we
should recommend the default options.
Change-Id: Ief347c897cf15ab4101936a56404e3a378021b15
(cherry picked from commit e7110a9c6e0119b3d0c6f5cdb3b9675a82b76039)
| -rw-r--r-- | etc/glance-api.conf | 4 | ||||
| -rw-r--r-- | etc/glance-registry.conf | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/etc/glance-api.conf b/etc/glance-api.conf index a62de1667..bf5b82442 100644 --- a/etc/glance-api.conf +++ b/etc/glance-api.conf @@ -665,9 +665,7 @@ image_cache_dir = /var/lib/glance/image-cache/ #db_max_retries = 20 [keystone_authtoken] -auth_host = 127.0.0.1 -auth_port = 35357 -auth_protocol = http +identity_uri = http://127.0.0.1:35357 admin_tenant_name = %SERVICE_TENANT_NAME% admin_user = %SERVICE_USER% admin_password = %SERVICE_PASSWORD% diff --git a/etc/glance-registry.conf b/etc/glance-registry.conf index e46f57d9a..87d61c457 100644 --- a/etc/glance-registry.conf +++ b/etc/glance-registry.conf @@ -221,9 +221,7 @@ qpid_tcp_nodelay = True #db_max_retries = 20 [keystone_authtoken] -auth_host = 127.0.0.1 -auth_port = 35357 -auth_protocol = http +identity_uri = http://127.0.0.1:35357 admin_tenant_name = %SERVICE_TENANT_NAME% admin_user = %SERVICE_USER% admin_password = %SERVICE_PASSWORD% |