Commit graph

82 commits

Author SHA1 Message Date
Brian Coca
468770c894 Merge pull request from schrodervictor/adds-elasticache-to-ec2-dynamic-inventory
Adds ElastiCache to ec2 dynamic inventory plugin
2015-06-30 16:51:11 -04:00
Victor Schröder
df77d087a5 Adds the check for 'not None' also when building host_info dict for ElastiCache clusters, nodes and replication groups 2015-06-29 23:28:55 +02:00
Victor Schröder
d88a42570e Adds a check for 'not None' values when iterating ElastiCache SecurityGroups keys 2015-06-29 21:56:36 +02:00
Marc Tamsky
a0e8b9ef98 for tags with empty value, do not append separator 2015-06-16 19:28:53 -07:00
Victor Schröder
2acfbce64d Removes unnecessary commented code and replaces with useful information 2015-06-15 11:35:25 +02:00
Victor Schröder
f2d22c1373 Fixes error messages to mention ElastiCache 2015-06-15 10:02:54 +02:00
Victor Schröder
e8c3e3d645 Cleans some unnecessary white spaces in ec2.py dynamic inventory plugin 2015-06-14 23:38:09 +02:00
Victor Schröder
77a2ad0e8c Improves code organization in get_dict_from_describe_dict method 2015-06-14 23:32:10 +02:00
Victor Schröder
41b034a5d2 Process information about replica clusters for ElastiCache replication groups 2015-06-14 23:29:55 +02:00
Victor Schröder
e692a18a29 Process information about primary clusters for ElastiCache replication groups 2015-06-14 23:29:05 +02:00
Victor Schröder
43f9a653d0 Process CacheNodeIdsToReboot complex type for cache clusters 2015-06-14 23:27:16 +02:00
Victor Schröder
ffd74049da Comments about the naming pattern in the script, that certainly deserves future refactoring 2015-06-14 23:24:51 +02:00
Victor Schröder
f25ad9dc51 Adds the appropriate key checks for ElastiCache replication groups in get_dict_from_describe_dict method 2015-06-14 23:21:33 +02:00
Victor Schröder
069ee11699 Creates add_elasticache_replication_group method in ec2.py dynamic inventory script 2015-06-14 23:18:30 +02:00
Victor Schröder
c18f6cae11 Creates get_elasticache_replication_groups_by_region method to handle the API call 2015-06-14 23:15:33 +02:00
Victor Schröder
40ce072747 Adds the logic to process the new config entries about ElastiCache replication groups 2015-06-14 23:14:00 +02:00
Victor Schröder
e64daba8e7 Adds a flag (is_redis) to prevent duplicity of information about Redis single node clusters 2015-06-14 23:10:33 +02:00
Victor Schröder
2a242a0e1b Creates add_elasticache_node method in ec2.py 2015-06-14 23:08:39 +02:00
Victor Schröder
98a5531966 Makes the API requests to return nodes' information too 2015-06-14 23:03:15 +02:00
Victor Schröder
dbb0304cea Adds uncammelize helper method to put the labels in the expected output format 2015-06-14 23:01:13 +02:00
Victor Schröder
c6f2b08a60 Creates get_host_info_dict_from_describe_dict helper method to translate information from a 'describe' call (we don't have instance objects in this case) 2015-06-14 22:57:03 +02:00
Victor Schröder
2cd76cf0e3 Creates add_elasticache_cluster method to digest the API answer about ElastiCache clusters 2015-06-14 22:41:05 +02:00
Victor Schröder
06c6db8e6b Adds get_elasticache_clusters_by_region method to perform the API call to AWS (and sadly finds out that Boto support for ElastiCache is very outdated...) 2015-06-14 22:21:40 +02:00
Victor Schröder
50b320615e Little improvement in the organization of the configuration loader method 2015-06-14 22:13:27 +02:00
Victor Schröder
bc80bd36af Adds the necessary logic to ec2.py to load ElastiCache related configuration 2015-06-14 22:12:03 +02:00
Paul Logston
e8768b2b87 Use six to check for string_types 2015-04-25 19:45:22 -04:00
Paul Logston
50932ce556 Use six.moves to import configparser 2015-04-25 17:06:01 -04:00
Paul Logston
1674b47445 Make ec2 inventory plugin Python 3 compatible 2015-04-24 21:14:06 -04:00
Johannes 'fish' Ziemke
c7f3362795 Replace - in ec2 inventory as well
Dash (-) is not a variable ansible group name, so it needs to be replaced as well.
2015-04-06 14:43:39 +02:00
Kim Johansson
576832e4c9 Always define error before using it
When the error reason is "Forbidden", the code throws a Python exception
rather than simply outputting the exception reason.

It's not nice to throw a Python exception when all the info to display
a proper message is available.
2015-03-27 10:46:01 +01:00
Steve Gargan
ada2567dfb log errors and explicitly exit rather than raising exceptions 2015-03-16 20:00:18 +00:00
Steve Gargan
fbff0449ce fix for issue . outputs informative error message when AWS credentials are not available 2015-03-15 12:24:42 +00:00
Chris Church
05bb31450b Update EC2 inventory script with changes from Tower.
- Adds to changes from  to support nested VPC group and VPC grouping for RDS.

- Adds to changes from  to ignore invalid instance filters.

- Implements grouping by AMI ID based on .

- Implements configuration options to limit which groups are created automatically, based on .
2015-02-11 01:47:37 -05:00
Brian Coca
5eafa1e7c3 Merge pull request from kalefranz/ec2-inventory-tags
Allow ec2 tags to be used to address servers in ec2 dynamic inventory.
2015-02-02 12:58:58 -05:00
Chris Meyers
48d4da3a94 add tagless grouping for destinations without any tags 2015-01-16 10:28:34 -05:00
Jason
d39a25d225 Corrected spelling mistake 2015-01-08 17:11:16 +11:00
Dan Jenkins
d7b36dd9e7 Add a new inventory group so you can see instances in a particular VPC 2014-12-19 10:39:56 +00:00
Kale Franz
28e69b9017 Allow ec2 tags to be used to address servers in ec2 dynamic inventory. 2014-12-15 22:31:29 -08:00
Andres Silva
4755bde28d adding for loop on list to to handle the return of none when the list is empty. With the previous method if the list was empty the script died. See http://stackoverflow.com/questions/18852324/typeerror-sequence-item-0-expected-string-nonetype-found 2014-10-17 12:16:35 -04:00
Michal Gasek
5b5103e6b4 Add support for filtering EC2 instances in dynamic inventory
This allows filtering out EC2 instances based on various different
filters including tags. As requested in 7480 it supports logical "OR"
instead of "AND" on the provided list of filters.
2014-09-03 00:50:28 +02:00
Michael Peters
8b1d6f5e75 fixing "else" typo 2014-08-12 15:48:14 -04:00
Michael Peters
7194fe1064 need to handle the case where include_pattern and exclude_pattern exist in the config file but contain empty strings 2014-08-12 15:40:15 -04:00
Michael Peters
7c2cc15c59 adding include_pattern and exclude_pattern options to ec2.py 2014-08-08 09:26:14 -04:00
James Cammarata
0ae87cb725 Merge branch 'ec2inv-rdstoggle' of https://github.com/ingmar/ansible into ingmar-ec2inv-rdstoggle
Conflicts:
	plugins/inventory/ec2.py
2014-07-31 13:38:54 -05:00
James Cammarata
5764015876 Merge branch 'ec2_nested_groups' of https://github.com/cchurch/ansible into cchurch-ec2_nested_groups
Conflicts:
	plugins/inventory/ec2.py
2014-07-31 13:07:31 -05:00
Adam Chainz
13a5993a49 Fix indentation in ec2.py 2014-07-14 10:59:17 +01:00
Chris Church
7f27c56a79 Add option to return all EC2/RDS instances regardless of state. 2014-07-01 15:50:04 -04:00
Chris Church
4036df11cf Add configurable option to support nested inventory groups. 2014-07-01 15:29:39 -04:00
Ingmar Hupp
cc01f7b7f5 Do not filter out RDS instances by default or in INI file to avoid changing current behaviour. 2014-03-27 18:58:46 +00:00
Ingmar Hupp
456d2627e8 EC2 inventory toggle to exclude/include RDS instances. 2014-03-27 15:57:24 +00:00