Merge pull request #4005 from herbyg-axial/ansible/

ec2 inventory script: Add a global group for EC2 and RDS instances when listing EC2 inventory

1 files changed, 6 insertions, 0 deletions

diff --git a/plugins/inventory/ec2.py b/plugins/inventory/ec2.py
index 27d724ea53..47f9ddb385 100755
--- a/plugins/inventory/ec2.py
+++ b/plugins/inventory/ec2.py
@@ -373,6 +373,9 @@ class Ec2Inventory(object):
             for name in route53_names:
                 self.push(self.inventory, name, dest)
 
+        # Global Tag: tag all EC2 instances
+        self.push(self.inventory, 'ec2', dest)
+
 
     def add_rds_instance(self, instance, region):
         ''' Adds an RDS instance to the inventory and index, as long as it is
@@ -424,6 +427,9 @@ class Ec2Inventory(object):
         # Inventory: Group by parameter group
         self.push(self.inventory, self.to_safe("rds_parameter_group_" + instance.parameter_group.name), dest)
 
+        # Global Tag: all RDS instances
+        self.push(self.inventory, 'rds', dest)
+
 
     def get_route53_records(self):
         ''' Get and store the map of resource records to domain names that