Merge "Upload interfaces config before attributes"

1 files changed, 7 insertions, 14 deletions

diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py
index eabec397c..a50973af6 100644
--- a/deploy/cloud/configure_nodes.py
+++ b/deploy/cloud/configure_nodes.py
@@ -32,27 +32,20 @@ class ConfigureNodes(object):
     def config_nodes(self):
         log('Configure nodes')
 
-        # Super dirty fix since Fuel 7 requires user defined roles to be
-        # assigned before anything else (BUG fixed in Fuel 8)!
+        # Assign nodes to environment with given roles
         for node_id, roles_blade in self.node_id_roles_dict.iteritems():
-            if "opendaylight" in roles_blade[0] or "onos" in roles_blade[0] or "contrail" in roles_blade[0]:
-                exec_cmd('fuel node set --node-id %s --role %s --env %s'
-                         % (node_id, roles_blade[0], self.env_id))
+            exec_cmd('fuel node set --node-id %s --role %s --env %s'
+                     % (node_id, roles_blade[0], self.env_id))
 
         for node_id, roles_blade in self.node_id_roles_dict.iteritems():
-            if "opendaylight" not in roles_blade[0] and "onos" not in roles_blade[0] and "contrail" not in roles_blade[0]:
-                exec_cmd('fuel node set --node-id %s --role %s --env %s'
-                         % (node_id, roles_blade[0], self.env_id))
-
-        for node_id, roles_blade in self.node_id_roles_dict.iteritems():
-            # Modify node attributes
-            self.download_attributes(node_id)
-            self.modify_node_attributes(node_id, roles_blade)
-            self.upload_attributes(node_id)
             # Modify interfaces configuration
             self.download_interface_config(node_id)
             self.modify_node_interface(node_id, roles_blade)
             self.upload_interface_config(node_id)
+            # Modify node attributes
+            self.download_attributes(node_id)
+            self.modify_node_attributes(node_id, roles_blade)
+            self.upload_attributes(node_id)
 
         # Currently not used, we use default deployment facts
         # which are generated by fuel based on type segmentation