From 13b77d3670ccd69530850fe72c6dba33e663cc64 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Tue, 17 Dec 2019 12:32:54 +0530 Subject: [PATCH] Ensure blacklisted nodes are not included in server_names 'ServerIdData' map actually returns 'None' ids for blacklisted nodes for a role, as 'nova_server_resource' output is evaluated with condition 'server_not_blacklisted'. This results in get_server_names() returning these blacklisted nodes with something like 'None: compute-1' and results in issues when we write ansible_host_vars. As we don't intend to write ansible_host_vars for blacklisted nodes, we can ignore these from 'server_names'. Closes-bug: #1856661 Change-Id: Iafecc885abac5583c07bc046bc4d541f5e1e1c00 (cherry picked from commit d407c96d17020a15395ba4f6537e03e596caedaa) --- tripleo_common/utils/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tripleo_common/utils/config.py b/tripleo_common/utils/config.py index 129b16cfd..8eb0f7054 100644 --- a/tripleo_common/utils/config.py +++ b/tripleo_common/utils/config.py @@ -50,7 +50,8 @@ class Config(object): for idx, name in enumerate(shortnames): if 'server_ids' in role_node_id_map: server_id = role_node_id_map['server_ids'][role][idx] - servers[server_id] = name.lower() + if server_id is not None: + servers[server_id] = name.lower() return servers def get_deployment_data(self, stack,