Merge "Upload interfaces config before attributes"

[fuel.git] / deploy / cloud / deployment.py

diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py
index 75bd4ef..28bcfdf 100644 (file)
--- a/deploy/cloud/deployment.py
+++ b/deploy/cloud/deployment.py
@@ -13,15 +13,10 @@ import json
 
 from common import (
     N,
-    E,
     exec_cmd,
-    run_proc,
-    run_proc_wait_terminated,
-    run_proc_kill,
     parse,
     err,
     log,
-    delete,
 )
 
 SEARCH_TEXT = '(err)'
@@ -130,7 +125,7 @@ class Deployment(object):
                     log('Error during deployment: {}'.format(msg))
                     break
                 if sts == 'running':
-                    log('Environmnent deploymnet progress: {}%'.format(prg))
+                    log('Environment deployment progress: {}%'.format(prg))
                 elif sts == 'ready':
                     ready = True
                     break
@@ -179,8 +174,13 @@ class Deployment(object):
             out, _ = exec_cmd('fuel2 task show {} -f json'.format(id), False)
             task_info = json.loads(out)
             properties = {}
-            for d in task_info:
-                    properties.update({d['Field']: d['Value']})
+            # for 9.0 this can be list of dicts or dict
+            # see https://bugs.launchpad.net/fuel/+bug/1625518
+            if isinstance(task_info, list):
+                for d in task_info:
+                        properties.update({d['Field']: d['Value']})
+            else:
+                return task_info
             return properties
         except ValueError as e:
             err('Unable to fetch task info: {}'.format(e))