summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-21 15:09:24 +0000
committerGerrit Code Review <review@openstack.org>2017-08-21 15:09:24 +0000
commit04352f339db2eec1382b2f085651200774b56f29 (patch)
treeb49527d4416df2b943ff095eae1b7edb380cfd2c
parentaefe534d782457a6daf1435e520177e42ca70a81 (diff)
parent32a7c4dfbd9ad794a3c5d300c4996c6586fc0626 (diff)
downloadceilometer-9.0.0.tar.gz
Merge "deprecated pollster-list"9.0.0
-rw-r--r--ceilometer/cmd/polling.py4
-rw-r--r--releasenotes/notes/deprecate-pollster-list-ccf22b0dea44f043.yaml5
2 files changed, 8 insertions, 1 deletions
diff --git a/ceilometer/cmd/polling.py b/ceilometer/cmd/polling.py
index 9b3000e8..6d8be955 100644
--- a/ceilometer/cmd/polling.py
+++ b/ceilometer/cmd/polling.py
@@ -68,9 +68,11 @@ CLI_OPTS = [
'resource polling'),
MultiChoicesOpt('pollster-list',
default=[],
+ deprecated_for_removal=True,
dest='pollster_list',
help='List of pollsters (or wildcard templates) to be '
- 'used while polling'),
+ 'used while polling. This option is deprecated. '
+ 'Configure pollsters via polling.yaml'),
]
diff --git a/releasenotes/notes/deprecate-pollster-list-ccf22b0dea44f043.yaml b/releasenotes/notes/deprecate-pollster-list-ccf22b0dea44f043.yaml
new file mode 100644
index 00000000..129dc9d3
--- /dev/null
+++ b/releasenotes/notes/deprecate-pollster-list-ccf22b0dea44f043.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+ - |
+ Deprecating support for enabling pollsters via command line. Meter and
+ pollster enablement should be configured via polling.yaml file.