[deployment_handler] Fix getting roles from fuel node output

[releng.git] / modules / opnfv / deployment / fuel / adapter.py

diff --git a/modules/opnfv/deployment/fuel/adapter.py b/modules/opnfv/deployment/fuel/adapter.py
index 9e22ba8..4ba9ca9 100644 (file)
--- a/modules/opnfv/deployment/fuel/adapter.py
+++ b/modules/opnfv/deployment/fuel/adapter.py
@@ -66,7 +66,7 @@ class FuelAdapter(manager.DeploymentHandler):
         if options and options['cluster'] and len(self.nodes) > 0:
             n = []
             for node in self.nodes:
-                if node.info['cluster'] == options['cluster']:
+                if str(node.info['cluster']) == str(options['cluster']):
                     n.append(node)
             return n
 
@@ -114,7 +114,7 @@ class FuelAdapter(manager.DeploymentHandler):
                 index_ip = i
             elif "mac" in fields[i]:
                 index_mac = i
-            elif "roles " in fields[i]:
+            elif "roles " in fields[i] and "pending_roles" not in fields[i]:
                 index_roles = i
             elif "online" in fields[i]:
                 index_online = i