From 36fe595de82407149b951756c06ea95956919ea5 Mon Sep 17 00:00:00 2001 From: Herby Gillot Date: Mon, 2 Sep 2013 22:02:56 -0400 Subject: [PATCH] ec2 inventory script: Add a global group for EC2 and RDS instances when listing EC2 inventory --- plugins/inventory/ec2.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/inventory/ec2.py b/plugins/inventory/ec2.py index 913ddb5f84a..cd3501da279 100755 --- a/plugins/inventory/ec2.py +++ b/plugins/inventory/ec2.py @@ -349,6 +349,9 @@ class Ec2Inventory(object): key = self.to_safe("tag_" + k + "=" + v) self.push(self.inventory, key, 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 @@ -400,6 +403,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_host_info(self): ''' Get variables about a specific host '''