diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-31 20:52:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-31 20:52:54 +0000 |
| commit | cecc273223cd4ff47b8517f7e79f08903798b7e3 (patch) | |
| tree | b0f8d24b2abbcd9747d6523e709a3bb086fb4be2 | |
| parent | b0b8ae9dc3bcc0ca8563b0c62f091f7fee55cdc2 (diff) | |
| parent | 3f2772bdbaf226867342ffd7ee2a59b4b9610903 (diff) | |
| download | ironic-cecc273223cd4ff47b8517f7e79f08903798b7e3.tar.gz | |
Merge "ironic_host_manager was missing two stats"
| -rw-r--r-- | ironic/nova/scheduler/ironic_host_manager.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ironic/nova/scheduler/ironic_host_manager.py b/ironic/nova/scheduler/ironic_host_manager.py index c855f8370..9541034fb 100644 --- a/ironic/nova/scheduler/ironic_host_manager.py +++ b/ironic/nova/scheduler/ironic_host_manager.py @@ -23,6 +23,7 @@ subdivided into multiple instances. from oslo.config import cfg from nova.openstack.common import log as logging +from nova.openstack.common import timeutils from nova.scheduler import host_manager host_manager_opts = [ @@ -68,14 +69,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): |