Merge "Fix host_aggregate to tolerate aggregate.hosts being None"

This commit is contained in:
Zuul
2021-06-07 15:45:40 +00:00
committed by Gerrit Code Review

View File

@@ -126,14 +126,14 @@ def _update_hosts(cloud, aggregate, hosts, purge_hosts):
if hosts is None: if hosts is None:
return return
hosts_to_add = set(hosts) - set(aggregate.hosts) hosts_to_add = set(hosts) - set(aggregate.get("hosts", []))
for i in hosts_to_add: for i in hosts_to_add:
cloud.add_host_to_aggregate(aggregate.id, i) cloud.add_host_to_aggregate(aggregate.id, i)
if not purge_hosts: if not purge_hosts:
return return
hosts_to_remove = set(aggregate.hosts) - set(hosts) hosts_to_remove = set(aggregate.get("hosts", [])) - set(hosts)
for i in hosts_to_remove: for i in hosts_to_remove:
cloud.remove_host_from_aggregate(aggregate.id, i) cloud.remove_host_from_aggregate(aggregate.id, i)