Merge "Fix aggregate placement sync issue"

Author: Zuul

nova/compute/api.py

@@ -6029,9 +6029,11 @@ def add_host_to_aggregate(self, context, aggregate_id, host_name):
 
         aggregate.add_host(host_name)
         self.query_client.update_aggregates(context, [aggregate])
+        nodes = objects.ComputeNodeList.get_all_by_host(context, host_name)
+        node_name = nodes[0].hypervisor_hostname
         try:
             self.placement_client.aggregate_add_host(
-                context, aggregate.uuid, host_name=host_name)
+                context, aggregate.uuid, host_name=node_name)
         except (exception.ResourceProviderNotFound,
                 exception.ResourceProviderAggregateRetrievalFailed,
                 exception.ResourceProviderUpdateFailed,
@@ -6045,7 +6047,7 @@ def add_host_to_aggregate(self, context, aggregate_id, host_name):
             LOG.warning("Failed to associate %s with a placement "
                         "aggregate: %s. This may be corrected after running "
                         "nova-manage placement sync_aggregates.",
-                        host_name, err)
+                        node_name, err)
         self._update_az_cache_for_host(context, host_name, aggregate.metadata)
         # NOTE(jogo): Send message to host to support resource pools
         self.compute_rpcapi.add_aggregate_host(context,
@@ -6083,19 +6085,21 @@ def remove_host_from_aggregate(self, context, aggregate_id, host_name):
         # we change anything on the nova side because if we did the nova stuff
         # first we can't re-attempt this from the compute API if cleaning up
         # placement fails.
+        nodes = objects.ComputeNodeList.get_all_by_host(context, host_name)
+        node_name = nodes[0].hypervisor_hostname
         try:
             # Anything else this raises is handled in the route handler as
             # either a 409 (ResourceProviderUpdateConflict) or 500.
             self.placement_client.aggregate_remove_host(
-                context, aggregate.uuid, host_name)
+                context, aggregate.uuid, node_name)
         except exception.ResourceProviderNotFound as err:
             # If the resource provider is not found then it's likely not part
             # of the aggregate anymore anyway since provider aggregates are
             # not resources themselves with metadata like nova aggregates, they
             # are just a grouping concept around resource providers. Log and
             # continue.
             LOG.warning("Failed to remove association of %s with a placement "
-                        "aggregate: %s.", host_name, err)
+                        "aggregate: %s.", node_name, err)
 
         aggregate.delete_host(host_name)
         self.query_client.update_aggregates(context, [aggregate])