summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwann Croiset <scroiset@mirantis.com>2017-02-07 14:12:14 +0100
committerSwann Croiset <scroiset@mirantis.com>2017-02-09 12:55:26 +0000
commit3a2c9ce00277bde6e0fca5fdaf2b6439f347f45c (patch)
treee97b83e5ae561bd11c7e2fc3a65eee538b7bf36d
parent275664c869e789560d3be9710ff2bd81db09c38c (diff)
Use Cinder API v2
Notes
Notes (review): Code-Review+1: Olivier Bourdon <obourdon@mirantis.com> Code-Review+2: Simon Pasquier <spasquier@mirantis.com> Workflow+1: Swann Croiset <scroiset@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 09 Feb 2017 13:17:28 +0000 Reviewed-on: https://review.openstack.org/430244 Project: openstack/fuel-plugin-lma-collector Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py
index 8211f71..880e082 100644
--- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py
+++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py
@@ -37,7 +37,7 @@ class CinderStatsPlugin(openstack.CollectdPlugin):
37 37
38 def itermetrics(self): 38 def itermetrics(self):
39 39
40 volumes_details = self.get_objects('cinder', 'volumes', 40 volumes_details = self.get_objects('cinderv2', 'volumes',
41 params={'all_tenants': 1}, 41 params={'all_tenants': 1},
42 detail=True) 42 detail=True)
43 43
@@ -66,7 +66,7 @@ class CinderStatsPlugin(openstack.CollectdPlugin):
66 'values': size 66 'values': size
67 } 67 }
68 68
69 snaps_details = self.get_objects('cinder', 'snapshots', 69 snaps_details = self.get_objects('cinderv2', 'snapshots',
70 params={'all_tenants': 1}) 70 params={'all_tenants': 1})
71 status_snaps = self.count_objects_group_by(snaps_details, 71 status_snaps = self.count_objects_group_by(snaps_details,
72 group_by_func=groupby) 72 group_by_func=groupby)