From ed4b806cbad2ba44d9ac68df3f7f7f15980392d9 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Tue, 19 Jan 2016 12:34:36 +0100 Subject: [PATCH] Fix to allow more physical nodes defined in DHA than node definitions in dea NOT VERIFIED DO NOT MERGE Change-Id: Id5b6029d11bfcd394e6f84a7b73b8a17820561cf Signed-off-by: Jonas Bjurel --- deploy/cloud/deploy.py | 5 +++-- deploy/cloud/deployment.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deploy/cloud/deploy.py b/deploy/cloud/deploy.py index 14d6a9621..679b0ad6f 100644 --- a/deploy/cloud/deploy.py +++ b/deploy/cloud/deploy.py @@ -42,8 +42,9 @@ class Deploy(object): def assign_roles_to_cluster_node_ids(self): self.node_roles_dict = {} for blade, node in self.blade_node_dict.iteritems(): - roles = commafy(self.dea.get_node_role(blade)) - self.node_roles_dict[node] = (roles, blade) + if self.dea.get_node_role(blade): + roles = commafy(self.dea.get_node_role(blade)) + self.node_roles_dict[node] = (roles, blade) def configure_environment(self): release_list = parse(exec_cmd('fuel release -l')) diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py index 29134b373..63c8c1e53 100644 --- a/deploy/cloud/deployment.py +++ b/deploy/cloud/deployment.py @@ -132,7 +132,7 @@ class Deployment(object): node_list = parse(exec_cmd('fuel node list')) failed_nodes = [] for node in node_list: - if node[N['status']] != 'ready': + if node[N['status']] != 'ready' and node[N['cluster']] != 'None': failed_nodes.append((node[N['id']], node[N['status']])) if failed_nodes: -- 2.16.6