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

listing EC2 inventory
pull/4005/head
Herby Gillot 11 years ago
parent 6dd3505c9e
commit 36fe595de8

@ -349,6 +349,9 @@ class Ec2Inventory(object):
key = self.to_safe("tag_" + k + "=" + v) key = self.to_safe("tag_" + k + "=" + v)
self.push(self.inventory, key, dest) 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): def add_rds_instance(self, instance, region):
''' Adds an RDS instance to the inventory and index, as long as it is ''' 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 # Inventory: Group by parameter group
self.push(self.inventory, self.to_safe("rds_parameter_group_" + instance.parameter_group.name), dest) 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): def get_host_info(self):
''' Get variables about a specific host ''' ''' Get variables about a specific host '''

Loading…
Cancel
Save