summaryrefslogtreecommitdiff
path: root/ceilometer/agent.py
diff options
context:
space:
mode:
authorIgor Degtiarov <idegtiarov@mirantis.com>2014-06-25 17:55:59 +0300
committerIgor Degtiarov <idegtiarov@mirantis.com>2014-06-25 17:55:59 +0300
commita440759d40902edeee8590e20ff04efa8892f858 (patch)
tree73d9d8c13bde7c02fe6d00785f02fdda05ac2938 /ceilometer/agent.py
parenta4ad787b3f63b7e98feb474779c2a76a5e87f7aa (diff)
downloadceilometer-a440759d40902edeee8590e20ff04efa8892f858.tar.gz
Fix F402 violations and re-enable gating
F402 got stricter in hacking 0.9, so fix new violations and re-enable gating. Change-Id: I81a1b14311ea6dc7f01353aa27d1f18f1aec8e81
Diffstat (limited to 'ceilometer/agent.py')
-rw-r--r--ceilometer/agent.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/ceilometer/agent.py b/ceilometer/agent.py
index 0427a5b6..4dc17eb8 100644
--- a/ceilometer/agent.py
+++ b/ceilometer/agent.py
@@ -69,8 +69,8 @@ class PollingTask(object):
def add(self, pollster, pipelines):
self.publish_context.add_pipelines(pipelines)
- for pipeline in pipelines:
- self.resources[pollster.name].extend(pipeline)
+ for pipe_line in pipelines:
+ self.resources[pollster.name].extend(pipe_line)
self.pollsters.update([pollster])
def poll_and_publish(self):
@@ -121,15 +121,15 @@ class AgentManager(os_service.Service):
def setup_polling_tasks(self):
polling_tasks = {}
- for pipeline, pollster in itertools.product(
+ for pipe_line, pollster in itertools.product(
self.pipeline_manager.pipelines,
self.pollster_manager.extensions):
- if pipeline.support_meter(pollster.name):
- polling_task = polling_tasks.get(pipeline.get_interval())
+ if pipe_line.support_meter(pollster.name):
+ polling_task = polling_tasks.get(pipe_line.get_interval())
if not polling_task:
polling_task = self.create_polling_task()
- polling_tasks[pipeline.get_interval()] = polling_task
- polling_task.add(pollster, [pipeline])
+ polling_tasks[pipe_line.get_interval()] = polling_task
+ polling_task.add(pollster, [pipe_line])
return polling_tasks