diff --git a/plugin_source/deployment_scripts/compute_post_deployment.py b/plugin_source/deployment_scripts/compute_post_deployment.py index c9f4f1c..e2c5b4a 100755 --- a/plugin_source/deployment_scripts/compute_post_deployment.py +++ b/plugin_source/deployment_scripts/compute_post_deployment.py @@ -303,11 +303,13 @@ def patch_ceilometer(): ceilometer-poll-cpu-util.patch ceilometer-rates-always-zero.patch ceilometer-support-network-bytes.patch + ceilometer-add-purge_inspection_cache.patch """ patchfile_list = [ 'ceilometer-poll-cpu-util.patch', 'ceilometer-rates-always-zero.patch', 'ceilometer-support-network-bytes.patch', + 'ceilometer-add-purge_inspection_cache.patch', ] for patch_file in patchfile_list: utils.patch(DIST_PACKAGES_DIR, patch_file, 1) diff --git a/plugin_source/deployment_scripts/patchset/ceilometer-add-purge_inspection_cache.patch b/plugin_source/deployment_scripts/patchset/ceilometer-add-purge_inspection_cache.patch new file mode 100644 index 0000000..e3f9c72 --- /dev/null +++ b/plugin_source/deployment_scripts/patchset/ceilometer-add-purge_inspection_cache.patch @@ -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