ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #1351 from cocoy/ec2-v2

Browse source 
Fix check boto version bug #1280. Using try/except for AttributeError.
This commit is contained in:
Michael DeHaan 2012-10-16 20:16:40 -07:00
commit 47c4775e94
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/inventory/ec2.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/python -tt
#!/usr/bin/env python
'''
EC2 external inventory script
@ -108,6 +108,7 @@ Security groups are comma-separated in 'ec2_security_group_ids' and
######################################################################
import sys
import os
import argparse
import re
@ -132,7 +133,7 @@ class Ec2Inventory(object):
# Index of hostname (address) to instance ID
self.index = {}
# Read settings and parse CLI arguments
self.read_settings()
self.parse_cli_args()
@ -292,9 +293,14 @@ class Ec2Inventory(object):
self.push(self.inventory, instance.placement, dest)
# Inventory: Group by security group
for group in instance.groups:
key = self.to_safe("security_group_" + group.name)
self.push(self.inventory, key, dest)
try:
for group in instance.groups:
key = self.to_safe("security_group_" + group.name)
self.push(self.inventory, key, dest)
except AttributeError:
print 'Package boto seems a bit older.'
print 'Please upgrade boto >= 2.3.0.'
sys.exit(1)
# Inventory: Group by tag keys
for k, v in instance.tags.iteritems():