summaryrefslogtreecommitdiff
path: root/ceilometer/cmd
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-20 05:46:20 +0000
committerGerrit Code Review <review@openstack.org>2017-10-20 05:46:20 +0000
commit919e9cba9a35b41b1b4f6a4295d3e27a9cd4cf1a (patch)
treede6f9e43f0826a433a595752a47a96d0a854d896 /ceilometer/cmd
parent1ae91b8390eda9477dfc79764fc9f4376db02228 (diff)
parent32c129aabd05633ee8a2dbe5b91c01d2ff910882 (diff)
downloadceilometer-919e9cba9a35b41b1b4f6a4295d3e27a9cd4cf1a.tar.gz
Merge "Remove deprecated pollster-list option"
Diffstat (limited to 'ceilometer/cmd')
-rw-r--r--ceilometer/cmd/polling.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/ceilometer/cmd/polling.py b/ceilometer/cmd/polling.py
index 6d8be955..f5dadb48 100644
--- a/ceilometer/cmd/polling.py
+++ b/ceilometer/cmd/polling.py
@@ -66,21 +66,13 @@ CLI_OPTS = [
dest='polling_namespaces',
help='Polling namespace(s) to be used while '
'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. This option is deprecated. '
- 'Configure pollsters via polling.yaml'),
]
def create_polling_service(worker_id, conf):
return manager.AgentManager(worker_id,
conf,
- conf.polling_namespaces,
- conf.pollster_list)
+ conf.polling_namespaces)
def main():