openstack
/
nova
Code Issues Proposed changes

Merge "Update really old comments about vmware hosts managing multiple nodes"

This commit is contained in:
Zuul 2018-08-15 02:01:19 +00:00 committed by Gerrit Code Review
parent 755a44dd71 0c71208122
commit d61aa2f763
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/objects/compute_node.py
View File

@ -269,7 +269,7 @@ class ComputeNode(base.NovaPersistentObject, base.NovaObject):
def get_first_node_by_host_for_old_compat(cls, context, host,
use_slave=False):
computes = ComputeNodeList.get_all_by_host(context, host, use_slave)
# FIXME(sbauza): Some hypervisors (VMware, Ironic) can return multiple
# FIXME(sbauza): Ironic deployments can return multiple
# nodes per host, we should return all the nodes and modify the callers
# instead.
# Arbitrarily returning the first node.

4
nova/objects/service.py
View File

@ -237,7 +237,7 @@ class Service(base.NovaPersistentObject, base.NovaObject,
def _do_compute_node(self, context, primitive, version_manifest):
try:
target_version = version_manifest['ComputeNode']
# NOTE(sbauza): Some drivers (VMware, Ironic) can have multiple
# NOTE(sbauza): Ironic deployments can have multiple
# nodes for the same service, but for keeping same behaviour,
# returning only the first elem of the list
compute = objects.ComputeNodeList.get_all_by_host(
@ -302,7 +302,7 @@ class Service(base.NovaPersistentObject, base.NovaObject,
# NOTE(sbauza); Previous behaviour was raising a ServiceNotFound,
# we keep it for backwards compatibility
raise exception.ServiceNotFound(service_id=self.id)
# NOTE(sbauza): Some drivers (VMware, Ironic) can have multiple nodes
# NOTE(sbauza): Ironic deployments can have multiple nodes
# for the same service, but for keeping same behaviour, returning only
# the first elem of the list
self.compute_node = compute_nodes[0]