Download deployment config after modification 69/15069/3
authorPeter Barabas <peter.barabas@ericsson.com>
Thu, 2 Jun 2016 08:29:29 +0000 (10:29 +0200)
committerStefan Berg <stefan.k.berg@ericsson.com>
Thu, 2 Jun 2016 11:07:38 +0000 (11:07 +0000)
Modified network or interface configurations were not reflected in
the deployment config, resulting in faulty node configurations.

Change-Id: I4ca20702c0171e7995f2b4f46317557ec9d5beac
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
deploy/cloud/configure_nodes.py

index 46121df..b4875cc 100644 (file)
@@ -43,12 +43,18 @@ class ConfigureNodes(object):
                 exec_cmd('fuel node set --node-id %s --role %s --env %s'
                          % (node_id, roles_blade[0], self.env_id))
 
+        # Download the unmodified default deployment configuration, because we
+        # need it for the network config.
         self.download_deployment_config()
         for node_id, roles_blade in self.node_id_roles_dict.iteritems():
             self.download_interface_config(node_id)
             self.modify_node_interface(node_id, roles_blade)
             self.modify_node_network_schemes(node_id, roles_blade)
             self.upload_interface_config(node_id)
+
+        # Download our modified deployment configuration, which includes our
+        # changes to network topology etc.
+        self.download_deployment_config()
         self.upload_deployment_config()
 
     def modify_node_network_schemes(self, node_id, roles_blade):