From 08f83f543bc992ae8f2787fb405e58c33dadba73 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Wed, 6 Aug 2014 18:24:05 +1000 Subject: [PATCH] Use identity_uri instead of older fragments 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) --- etc/glance-api.conf | 4 +--- 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 a62de16671..bf5b824427 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 e46f57d9a5..87d61c4573 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%