diff options
| author | Zheng Yue <zhengyue@hihuron.com> | 2016-03-14 17:35:01 +0800 |
|---|---|---|
| committer | gordon chung <gord@live.ca> | 2016-03-14 08:53:32 -0400 |
| commit | be0ff9537d91acd9b2fc28a37c8ac0e2d3446978 (patch) | |
| tree | 7587f67e05130b24e8a73392d03193c36426a7ff | |
| parent | a922e10e47ccd0a481501374d88b196ce468bd33 (diff) | |
| download | ceilometer-be0ff9537d91acd9b2fc28a37c8ac0e2d3446978.tar.gz | |
Fix arguments error at call timeutils.utcnow
The function: timeutils.utcnow at oslo.utils which libary has limited
versions: !=1.4.1,<1.5.0,>=1.4.0, it has no arguments. But call at
compute/discovery.py passing a argument, it will throw TypeError.
Change-Id: I59817f163b882d677c7105bec9b1d8c3c57e5c5a
Closes-Bug: 1556469
| -rw-r--r-- | ceilometer/compute/discovery.py | 2 | ||||
| -rw-r--r-- | ceilometer/hardware/discovery.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ceilometer/compute/discovery.py b/ceilometer/compute/discovery.py index e85d067b..19a35b3f 100644 --- a/ceilometer/compute/discovery.py +++ b/ceilometer/compute/discovery.py @@ -45,7 +45,7 @@ class InstanceDiscovery(plugin_base.DiscoveryBase): self.instances.pop(instance.id, None) else: self.instances[instance.id] = instance - self.last_run = timeutils.utcnow(True).isoformat() + self.last_run = timeutils.utcnow().isoformat() return self.instances.values() @property diff --git a/ceilometer/hardware/discovery.py b/ceilometer/hardware/discovery.py index ef8fd188..d23b4041 100644 --- a/ceilometer/hardware/discovery.py +++ b/ceilometer/hardware/discovery.py @@ -63,7 +63,7 @@ class NodesDiscoveryTripleO(plugin_base.DiscoveryBase): self.instances.pop(instance.id, None) else: self.instances[instance.id] = instance - self.last_run = timeutils.utcnow(True).isoformat() + self.last_run = timeutils.utcnow().isoformat() resources = [] for instance in self.instances.values(): |