diff --git a/hooks/pg_dir_context.py b/hooks/pg_dir_context.py index 476dc1e..d84025b 100644 --- a/hooks/pg_dir_context.py +++ b/hooks/pg_dir_context.py @@ -31,12 +31,11 @@ def _pg_dir_ips(): Inspects plumgrid-director peer relation and returns the ips of the peer directors ''' - pg_dir_ips = [] - for rid in relation_ids('director'): - for unit in related_units(rid): - rdata = relation_get(rid=rid, unit=unit) - pg_dir_ips.append(get_host_ip(rdata['private-address'])) - return pg_dir_ips + return [get_host_ip(rdata['private-address']) + for rid in relation_ids("director") + for rdata in + (relation_get(rid=rid, unit=unit) for unit in related_units(rid)) + if rdata] class PGDirContext(context.NeutronContext): diff --git a/hooks/pg_dir_utils.py b/hooks/pg_dir_utils.py index 7f7d988..cc9c5bc 100644 --- a/hooks/pg_dir_utils.py +++ b/hooks/pg_dir_utils.py @@ -411,7 +411,6 @@ def get_cidr_from_iface(interface): def director_cluster_ready(): dirs_count = len(pg_dir_context._pg_dir_ips()) - log('DIR COUNT: %s' % dirs_count) return True if dirs_count == 2 else False