From d04d3122f89b1446bc3e0c8868edd11d3315bf7a Mon Sep 17 00:00:00 2001 From: Fei Long Wang Date: Sat, 2 Jul 2016 16:17:55 +1200 Subject: [PATCH] Fix duplicated osprofile config for registry Now when generating the config samples of Glance, glance-api.conf, glance-glare.conf and glance-registry.conf will include duplicated config options for osprofiler. It's because we're collecting osprofiler's options at two places: etc/oslo-config-generator and glance/opts.py. So to remove the duplication and keep consistenty with the other options format, the patch removes the collecting from etc/oslo-config-generator. Change-Id: I45ef0bc8453cb8894dc245b8acf390b9ee0f6bfd --- etc/oslo-config-generator/glance-api.conf | 1 - etc/oslo-config-generator/glance-glare.conf | 1 - etc/oslo-config-generator/glance-registry.conf | 1 - 3 files changed, 3 deletions(-) diff --git a/etc/oslo-config-generator/glance-api.conf b/etc/oslo-config-generator/glance-api.conf index 141d294ad3..2bbaf9f611 100644 --- a/etc/oslo-config-generator/glance-api.conf +++ b/etc/oslo-config-generator/glance-api.conf @@ -11,4 +11,3 @@ namespace = keystonemiddleware.auth_token namespace = oslo.log namespace = oslo.middleware.cors namespace = oslo.middleware.http_proxy_to_wsgi -namespace = osprofiler diff --git a/etc/oslo-config-generator/glance-glare.conf b/etc/oslo-config-generator/glance-glare.conf index 21fa8a7d44..f8ddeb0c46 100644 --- a/etc/oslo-config-generator/glance-glare.conf +++ b/etc/oslo-config-generator/glance-glare.conf @@ -7,4 +7,3 @@ namespace = oslo.db.concurrency namespace = keystonemiddleware.auth_token namespace = oslo.log namespace = oslo.middleware.cors -namespace = osprofiler diff --git a/etc/oslo-config-generator/glance-registry.conf b/etc/oslo-config-generator/glance-registry.conf index 42b4989fe8..d66863eb96 100644 --- a/etc/oslo-config-generator/glance-registry.conf +++ b/etc/oslo-config-generator/glance-registry.conf @@ -7,4 +7,3 @@ namespace = oslo.db.concurrency namespace = oslo.policy namespace = keystonemiddleware.auth_token namespace = oslo.log -namespace = osprofiler