From 6f17b97e224e37c5a3bf7bdb0345602c769d9c21 Mon Sep 17 00:00:00 2001 From: liyingjun Date: Tue, 16 Dec 2014 17:11:50 +0800 Subject: [PATCH] Remove endpoint_substitution_whitelist config option This option was removed from keystone. Change-Id: Ic8e553434b05e98067f4b8fa355197563cb84b80 Closes-bug: #1401586 --- doc/common/tables/keystone-catalog.xml | 4 ---- tools/autogenerate-config-flagmappings/keystone.flagmappings | 1 - 2 files changed, 5 deletions(-) diff --git a/doc/common/tables/keystone-catalog.xml b/doc/common/tables/keystone-catalog.xml index 30d3651333..9fce1ee1c3 100644 --- a/doc/common/tables/keystone-catalog.xml +++ b/doc/common/tables/keystone-catalog.xml @@ -29,10 +29,6 @@ driver = keystone.catalog.backends.sql.Catalog (StrOpt) Catalog backend driver. - - endpoint_substitution_whitelist = tenant_id, user_id, public_bind_host, admin_bind_host, compute_host, compute_port, admin_port, public_port, public_endpoint, admin_endpoint - (ListOpt) (Deprecated) List of possible substitutions for use in formatting endpoints. Use caution when modifying this list. It will give users with permission to create endpoints the ability to see those values in your configuration file. This option will be removed in Juno. - list_limit = None (IntOpt) Maximum number of entities that will be returned in a catalog collection. diff --git a/tools/autogenerate-config-flagmappings/keystone.flagmappings b/tools/autogenerate-config-flagmappings/keystone.flagmappings index f7fd476ba8..983a66b1fc 100644 --- a/tools/autogenerate-config-flagmappings/keystone.flagmappings +++ b/tools/autogenerate-config-flagmappings/keystone.flagmappings @@ -121,7 +121,6 @@ cache/proxies cache catalog/cache_time catalog catalog/caching catalog catalog/driver catalog -catalog/endpoint_substitution_whitelist catalog catalog/list_limit catalog catalog/template_file catalog credential/driver credential