summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMehdi Abaakouk <sileht@redhat.com>2016-10-13 14:29:28 +0200
committerMehdi Abaakouk <sileht@redhat.com>2016-11-24 15:29:46 +0100
commit1842e19487b4afb92cc5d2e87f5cf4281ed34603 (patch)
treef50dd85fc5481d5d512ccf19e7be59d4a80c219b /etc
parente16e2329e6a32a784e054f02ea37b7c19c35f7ac (diff)
downloadceilometer-1842e19487b4afb92cc5d2e87f5cf4281ed34603.tar.gz
register ceilometer options at runtime
This remove pollsters option from configfile sample due to a duplicate option registration. This will be fixed later. The exchange_control group in the config sample doesn't exit in reality exchange are in DEFAULT group. This removes usage of cfg.CONF everywhere left. This adds all missing OPTS in sample file. Change-Id: I48c11ee7e1aae65847958b98532b3bdb48a3ceb5
Diffstat (limited to 'etc')
-rw-r--r--etc/ceilometer/api_paste.ini2
-rw-r--r--etc/ceilometer/ceilometer-config-generator.conf1
2 files changed, 3 insertions, 0 deletions
diff --git a/etc/ceilometer/api_paste.ini b/etc/ceilometer/api_paste.ini
index f06634f3..4247f1bb 100644
--- a/etc/ceilometer/api_paste.ini
+++ b/etc/ceilometer/api_paste.ini
@@ -12,9 +12,11 @@ paste.app_factory = ceilometer.api.app:app_factory
[filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory
+oslo_config_project = ceilometer
[filter:request_id]
paste.filter_factory = oslo_middleware:RequestId.factory
+oslo_config_project = ceilometer
[filter:cors]
paste.filter_factory = oslo_middleware.cors:filter_factory
diff --git a/etc/ceilometer/ceilometer-config-generator.conf b/etc/ceilometer/ceilometer-config-generator.conf
index 59d6b45a..976385b7 100644
--- a/etc/ceilometer/ceilometer-config-generator.conf
+++ b/etc/ceilometer/ceilometer-config-generator.conf
@@ -2,6 +2,7 @@
output_file = etc/ceilometer/ceilometer.conf
wrap_width = 79
namespace = ceilometer
+namespace = ceilometer-auth
namespace = oslo.concurrency
namespace = oslo.db
namespace = oslo.log