Merge pull request #672 from edx/feanil/abbey_keyerror

Feanil/abbey keyerror

util/vpc-tools/abbey.py

@@ -407,6 +407,7 @@ def poll_sqs_ansible():
 
         now = int(time.time())
         if buf:
+            try:
                 if (now - max([msg['recv_ts'] for msg in buf])) > args.msg_delay:
                     # sort by TS instead of recv_ts
                     # because the sqs timestamp is not as
@@ -433,7 +434,12 @@ def poll_sqs_ansible():
                             for key, value in to_disp['msg']['OK'].iteritems():
                                 print "    {:<15}{}".format(key, value)
                         else:
-                        if to_disp['msg']['OK']['changed']:
+                            invocation = to_disp['msg']['OK']['invocation']
+                            module = invocation['module_name']
+                            # 'set_fact' does not provide a changed value.
+                            if module == 'set_fact':
+                                changed = "OK"
+                            elif to_disp['msg']['OK']['changed']:
                                 changed = "*OK*"
                             else:
                                 changed = "OK"
@@ -461,6 +467,8 @@ def poll_sqs_ansible():
                         completed += 1
                         if completed >= NUM_PLAYBOOKS:
                             return (to_disp['msg']['TS'], task_report)
+            except KeyError:
+                print "Failed to print status from message: {}".format(to_disp)
 
         if not messages:
             # wait 1 second between sqs polls