From 3f2772bdbaf226867342ffd7ee2a59b4b9610903 Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Fri, 28 Mar 2014 11:13:52 -0700 Subject: [PATCH] ironic_host_manager was missing two stats ironic_host_manager.IronicNodeState was not setting either self.total_usable_disk_gb or self.updated. Change-Id: I0d055dba584cf16043f80e96a16c30e42aaf6bb0 --- ironic/nova/scheduler/ironic_host_manager.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ironic/nova/scheduler/ironic_host_manager.py b/ironic/nova/scheduler/ironic_host_manager.py index b9bba07ba8..1dab66993d 100644 --- a/ironic/nova/scheduler/ironic_host_manager.py +++ b/ironic/nova/scheduler/ironic_host_manager.py @@ -22,6 +22,7 @@ subdivided into multiple instances. """ from nova.openstack.common import log as logging +from nova.openstack.common import timeutils from nova.scheduler import host_manager LOG = logging.getLogger(__name__) @@ -43,14 +44,18 @@ class IronicNodeState(host_manager.HostState): self.free_ram_mb = free_ram_mb self.total_usable_ram_mb = all_ram_mb self.free_disk_mb = free_disk_mb + self.total_usable_disk_gb = compute['local_gb'] self.vcpus_total = compute['vcpus'] self.vcpus_used = compute['vcpus_used'] + self.updated = compute['updated_at'] + def consume_from_instance(self, instance): """Consume nodes entire resources regardless of instance request.""" self.free_ram_mb = 0 self.free_disk_mb = 0 self.vcpus_used = self.vcpus_total + self.updated = timeutils.utcnow() def new_host_state(self, host, node, capabilities=None, service=None):