assorted small fixes, add some management infrastructure

[awsible] / inventory / asg-inventory.py

diff --git a/inventory/asg-inventory.py b/inventory/asg-inventory.py
index 74e21b0d1af3adf73de42499b64f18d2e2e40655..1eba92e66e0b93813d267964bd5362dec2694193 100755 (executable)
--- a/inventory/asg-inventory.py
+++ b/inventory/asg-inventory.py
@@ -68,7 +68,7 @@ def regionInventory(sessionArgs, publicIPs=False):
     inventory = {iid:[AllInstanceIPs[iid]] for iid in AllInstanceIPs}
 
     # add ASG dict, replacing ASG Instance Id with instance IP
-    inventory.update({asg:[AllInstanceIPs[iid] for iid in ASGs[asg]] for asg in ASGs})
+    inventory.update({asg:[AllInstanceIPs[iid] for iid in ASGs[asg] if iid in AllInstanceIPs] for asg in ASGs})
 
     return inventory