Merge "Add a patch for ceilometer to fit MOS9.2"
This commit is contained in:
commit
4b76575684
|
@ -305,11 +305,13 @@ def patch_ceilometer():
|
||||||
ceilometer-poll-cpu-util.patch
|
ceilometer-poll-cpu-util.patch
|
||||||
ceilometer-rates-always-zero.patch
|
ceilometer-rates-always-zero.patch
|
||||||
ceilometer-support-network-bytes.patch
|
ceilometer-support-network-bytes.patch
|
||||||
|
ceilometer-add-purge_inspection_cache.patch
|
||||||
"""
|
"""
|
||||||
patchfile_list = [
|
patchfile_list = [
|
||||||
'ceilometer-poll-cpu-util.patch',
|
'ceilometer-poll-cpu-util.patch',
|
||||||
'ceilometer-rates-always-zero.patch',
|
'ceilometer-rates-always-zero.patch',
|
||||||
'ceilometer-support-network-bytes.patch',
|
'ceilometer-support-network-bytes.patch',
|
||||||
|
'ceilometer-add-purge_inspection_cache.patch',
|
||||||
]
|
]
|
||||||
for patch_file in patchfile_list:
|
for patch_file in patchfile_list:
|
||||||
utils.patch(DIST_PACKAGES_DIR, patch_file, 1)
|
utils.patch(DIST_PACKAGES_DIR, patch_file, 1)
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
diff --git a/ceilometer/compute/virt/xenapi/inspector.py b/ceilometer/compute/virt/xenapi/inspector.py
|
||||||
|
index 6048e3a..d5676b1 100644
|
||||||
|
--- a/ceilometer/compute/virt/xenapi/inspector.py
|
||||||
|
+++ b/ceilometer/compute/virt/xenapi/inspector.py
|
||||||
|
@@ -238,3 +238,10 @@ class XenapiInspector(virt_inspector.Inspector):
|
||||||
|
write_bytes_rate=write_rate,
|
||||||
|
write_requests_rate=0)
|
||||||
|
yield(disk, disk_rate_info)
|
||||||
|
+
|
||||||
|
+ def purge_inspection_cache(self):
|
||||||
|
+ # Empty function to fit MOS9.2 where get_samples will invoke
|
||||||
|
+ # self.inspector.purge_inspection_cache(); will envalue if
|
||||||
|
+ # support cache for XenAPI. But obviously we need the
|
||||||
|
+ # the code for caching available in upstream firstly.
|
||||||
|
+ pass
|
Loading…
Reference in New Issue