Merge lp:~james-page/juju-deployer/add-machines-in-order into lp:juju-deployer

[James Page]

[Tim Van Steenburgh (tvansteenburgh)]

+1, thanks! Does this fix https://bugs.launchpad.net/juju-deployer/+bug/1625797 ?

review: Approve

[James Page (james-page)]

Unfortunately not.

=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2016-07-12 23:43:08 +0000
+++ deployer/action/importer.py	2016-09-22 14:23:58 +0000
@@ -99,7 +99,7 @@
 
         if machines:
             self.log.info("Creating machines...")
-            for machine_name, spec in machines.items():
+            for machine_name, spec in sorted(machines.items()):
                 if self.machine_exists(machine_name):
                     # XXX frankban: do we really want this? The machine
                     # identifiers as included in v4 bundles are not intended