diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-13 16:32:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-13 16:32:56 +0000 |
| commit | cd9673fcd73fa5f55f6c439be4bb00468d52ddb7 (patch) | |
| tree | c76b7f7270a85b35adc3959967a878426c05199f | |
| parent | e272e98bedd96ebb4f333df828e689964bcf4d43 (diff) | |
| parent | a483ec27a81b8b6d7a81145f28be97dc2c64ad6b (diff) | |
| download | ceilometer-8.0.2.tar.gz | |
Merge "Fixed error use retry_on_disconnect decorator" into stable/ocata8.0.2
| -rw-r--r-- | ceilometer/compute/discovery.py | 4 | ||||
| -rw-r--r-- | ceilometer/compute/virt/libvirt/inspector.py | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ceilometer/compute/discovery.py b/ceilometer/compute/discovery.py index d454b211..c0a28cb9 100644 --- a/ceilometer/compute/discovery.py +++ b/ceilometer/compute/discovery.py @@ -121,6 +121,10 @@ class InstanceDiscovery(plugin_base.DiscoveryBase): self._connection = libvirt_utils.get_libvirt_connection(self.conf) return self._connection + @connection.setter + def connection(self, value): + self._connection = value + def discover(self, manager, param=None): """Discover resources to monitor.""" if self.method != "libvirt_metadata": diff --git a/ceilometer/compute/virt/libvirt/inspector.py b/ceilometer/compute/virt/libvirt/inspector.py index 595749ad..f5b26524 100644 --- a/ceilometer/compute/virt/libvirt/inspector.py +++ b/ceilometer/compute/virt/libvirt/inspector.py @@ -44,6 +44,10 @@ class LibvirtInspector(virt_inspector.Inspector): self._connection = libvirt_utils.get_libvirt_connection(self.conf) return self._connection + @connection.setter + def connection(self, value): + self._connection = value + @libvirt_utils.retry_on_disconnect def _lookup_by_uuid(self, instance): instance_name = util.instance_name(instance) |